summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk2_ardour/editor_canvas.cc6
-rw-r--r--gtk2_ardour/editor_rulers.cc2
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();