fix headers not resizing properly when all tracks set to minimum height, then expande...

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3802 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 76565fd6bc8d36df7f287e8d798b48bc897abbc3..2cae8a8e48fdb23a3f40233080234002e7c05968 100644 (file)
--- 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        

diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 6334b72ce799aaaaf3ae318cc120eb9e7ba2f930..04e66d5ae1e994b95d233017407c6f084a852314 100644 (file)
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -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();