use a gloabl size group for track-header ctrl buttons
authorRobin Gareus <robin@gareus.org>
Thu, 4 Sep 2014 21:21:05 +0000 (23:21 +0200)
committerRobin Gareus <robin@gareus.org>
Thu, 4 Sep 2014 21:21:05 +0000 (23:21 +0200)
gtk2_ardour/time_axis_view.cc
gtk2_ardour/time_axis_view.h

index b4becc53119f49d61715f766aafa60f493e174c9..9d2c56fd7cb3d995383dff0cc5b0d841ae62640f 100644 (file)
@@ -73,12 +73,12 @@ int const TimeAxisView::_max_order = 512;
 unsigned int TimeAxisView::name_width_px = 100; // TODO adjust with font-scaling on style-change
 PBD::Signal1<void,TimeAxisView*> TimeAxisView::CatchDeletion;
 Glib::RefPtr<Gtk::SizeGroup> TimeAxisView::controls_meters_size_group = Glib::RefPtr<Gtk::SizeGroup>();
+Glib::RefPtr<Gtk::SizeGroup> TimeAxisView::controls_button_size_group = Glib::RefPtr<Gtk::SizeGroup>();
 Glib::RefPtr<Gtk::SizeGroup> TimeAxisView::track_number_v_size_group = Glib::RefPtr<Gtk::SizeGroup>();
 
 TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/)
        : AxisView (sess)
        , controls_table (3, 3)
-       , controls_button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_BOTH))
        , _name_editing (false)
        , height (0)
        , display_menu (0)
@@ -106,6 +106,9 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
        if (!track_number_v_size_group) {
                track_number_v_size_group = SizeGroup::create (SIZE_GROUP_VERTICAL);
        }
+       if (!controls_button_size_group) {
+               controls_button_size_group = SizeGroup::create (Gtk::SIZE_GROUP_BOTH);
+       }
        if (extra_height == 0) {
                compute_heights ();
        }
index 3d5bad68c852355ca221f73ec9852044ac1235bb..5125387e0f6ef58df23391834b472082892af46a 100644 (file)
@@ -202,12 +202,12 @@ class TimeAxisView : public virtual AxisView
        static uint32_t preset_height (Height);
 
        protected:
+       static Glib::RefPtr<Gtk::SizeGroup> controls_button_size_group;
        static Glib::RefPtr<Gtk::SizeGroup> controls_meters_size_group;
        static Glib::RefPtr<Gtk::SizeGroup> track_number_v_size_group;
        static unsigned int name_width_px;
        /* The Standard LHS Controls */
        Gtk::Table             controls_table;
-       Glib::RefPtr<Gtk::SizeGroup> controls_button_size_group;
        Gtk::EventBox          controls_ebox;
        Gtk::VBox              controls_vbox;
        Gtk::VBox              time_axis_vbox;