fix headers not resizing properly when all tracks set to minimum height, then expanded again, no need to redisplay tempo when altering ruler visibility (allocation takes care of that)

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3802 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Nick Mainsbridge 2008-09-24 09:59:47 +00:00
parent d97fa52d44
commit e193f9ebf3
2 changed files with 4 additions and 4 deletions

View file

@ -372,6 +372,8 @@ Editor::controls_layout_size_request (Requisition* req)
if (req->width != width) {
req->width = width;
time_button_event_box.set_size_request(edit_controls_vbox.get_width(), -1);
zoom_box.set_size_request(edit_controls_vbox.get_width(), -1);
}
gint height = min ( (gint) pos, (screen->get_height() - 400));
@ -379,15 +381,13 @@ Editor::controls_layout_size_request (Requisition* req)
req->height = height;
}
if ((width != edit_controls_vbox.get_width()) || height != pos) {
if (width != edit_controls_vbox.get_width()) {
/* this one is important: it determines how big the layout thinks it really is, as
opposed to what it displays on the screen
*/
controls_layout.set_size (edit_controls_vbox.get_width(), (guint) floor (pos));
controls_layout.set_size_request(edit_controls_vbox.get_width(), -1);
time_button_event_box.set_size_request(edit_controls_vbox.get_width(), -1);
zoom_box.set_size_request(edit_controls_vbox.get_width(), -1);
}
//cerr << "sizes = " << req->width << " " << edit_controls_vbox.get_width() << " " << controls_layout.get_width() << " " << zoom_box.get_width() << " " << time_button_frame.get_width() << endl;//DEBUG

View file

@ -798,7 +798,7 @@ Editor::update_ruler_visibility ()
time_canvas_event_box.queue_resize();
update_fixed_rulers();
redisplay_tempo (false);
//redisplay_tempo (false);
time_canvas_event_box.show_all();
ruler_label_event_box.show_all();