From 8b0e9befb9bf3297df76520db5f069a995ebf92c Mon Sep 17 00:00:00 2001 From: Nick Mainsbridge Date: Wed, 24 Sep 2008 09:59:17 +0000 Subject: [PATCH] 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/3.0@3801 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_canvas.cc | 6 +++--- gtk2_ardour/editor_rulers.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 1e26778135..2c728a4658 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -386,6 +386,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)); @@ -393,15 +395,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(), 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); } } diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 30a1ac992b..e37a9c04cb 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -801,7 +801,7 @@ Editor::update_ruler_visibility () time_canvas_event_box.queue_resize(); compute_fixed_ruler_scale(); update_fixed_rulers(); - redisplay_tempo (false); +// redisplay_tempo (false); time_canvas_event_box.show_all(); ruler_label_event_box.show_all();