Tweak zoom toolbar positioning.

git-svn-id: svn://localhost/ardour2/branches/3.0@7417 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 6a79b805941c56ef96a0dfea26096b7626ac0fc0..23a9a787a49fab551ecdf22e3c43757d8f659b5d 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2950,7 +2950,6 @@ Editor::setup_toolbar ()
        set_popdown_strings (zoom_focus_selector, zoom_focus_strings, true);
        zoom_focus_selector.signal_changed().connect (sigc::mem_fun(*this, &Editor::zoom_focus_selection_done));
 
-       _zoom_box.pack_start (zoom_focus_selector);
        _zoom_box.pack_start (zoom_out_button, false, false);
        _zoom_box.pack_start (zoom_in_button, false, false);
        _zoom_box.pack_start (zoom_out_full_button, false, false);
@@ -2969,6 +2968,8 @@ Editor::setup_toolbar ()
        _zoom_box.pack_start (tav_expand_button);
        _zoom_box.pack_start (tav_shrink_button);
 
+       _zoom_box.pack_start (zoom_focus_selector);
+       
        _zoom_tearoff = manage (new TearOff (_zoom_box));
 
        _zoom_tearoff->Detach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
@@ -3039,8 +3040,8 @@ Editor::setup_toolbar ()
        toolbar_hbox.set_border_width (1);
 
        toolbar_hbox.pack_start (*_mouse_mode_tearoff, false, false);
-       toolbar_hbox.pack_start (*_tools_tearoff, false, false);
        toolbar_hbox.pack_start (*_zoom_tearoff, false, false);
+       toolbar_hbox.pack_start (*_tools_tearoff, false, false);
 
        hbox->pack_start (snap_box, false, false);
        hbox->pack_start (*nudge_box, false, false);