summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_canvas.cc
diff options
context:
space:
mode:
authorNick Mainsbridge <beatroute@iprimus.com.au>2008-09-24 09:59:47 +0000
committerNick Mainsbridge <beatroute@iprimus.com.au>2008-09-24 09:59:47 +0000
commite193f9ebf3896b6cf59ac964397f59b9052fbec9 (patch)
tree7ac064128de60697b6bfb6ec4f578e7d8bad1ab9 /gtk2_ardour/editor_canvas.cc
parentd97fa52d4464e61fbfdba4412cf0dde254cb61c2 (diff)
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
Diffstat (limited to 'gtk2_ardour/editor_canvas.cc')
-rw-r--r--gtk2_ardour/editor_canvas.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 76565fd6bc..2cae8a8e48 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -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