force horizontal scrollbar and spacer, so strips line up nicely

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 4181626cf094bdf075f4931ad1ec2102b9f301c7..09398d554785460935022be1ed34d0217820d05e 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -78,7 +78,6 @@ using namespace ArdourMeter;
 
 MixerStrip* MixerStrip::_entered_mixer_strip;
 
-int MixerStrip::scrollbar_height = 0;
 PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
 
 MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
@@ -522,17 +521,16 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
                rec_mon_table.show ();
        }
 
-       if (_mixer_owned && (route()->is_master() || route()->is_monitor())) {
+       if (_mixer_owned && route()->is_master() ) {
 
-               if (scrollbar_height == 0) {
-                       HScrollbar scrollbar;
-                       Gtk::Requisition requisition(scrollbar.size_request ());
-                       scrollbar_height = requisition.height;
-               }
+               HScrollbar scrollbar;
+               Gtk::Requisition requisition(scrollbar.size_request ());
+               int scrollbar_height = requisition.height;
 
                spacer = manage (new EventBox);
-               spacer->set_size_request (-1, scrollbar_height);
+               spacer->set_size_request (-1, scrollbar_height+2);
                global_vpacker.pack_start (*spacer, false, false);
+               spacer->show();
        }
 
        if (is_track()) {

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 3bbe4e396b6efaf4aa670027465edbd54adbce11..eac39b3bee68632f4e0b6989cf0c066b7be57053 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -298,8 +298,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 
        void reset_strip_style ();
 
-       static int scrollbar_height;
-
        void update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width width, bool input_button);
        void port_connected_or_disconnected (boost::weak_ptr<ARDOUR::Port>, boost::weak_ptr<ARDOUR::Port>);
 

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 807de6baa4a8741fc8a7b39cc7e2f5278cb974d2..256a5cc91fa8a5105e14e6ef3c829270d7c27698 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -120,7 +120,7 @@ Mixer_UI::Mixer_UI ()
        b->show_all ();
 
        scroller.add (*b);
-       scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+       scroller.set_policy (Gtk::POLICY_ALWAYS, Gtk::POLICY_AUTOMATIC);
 
        setup_track_display ();