diff options
| author | Robin Gareus <robin@gareus.org> | 2014-09-06 03:36:01 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-09-06 03:36:01 +0200 |
| commit | 028346d412207934fa6feb2eee876638e92b9996 (patch) | |
| tree | 62067bc437fe99e11c8920909b836ac53b0882c8 /gtk2_ardour | |
| parent | dfecb069466876d03cf8583e331dc4ba2ee3a59d (diff) | |
Revert "use a gloabl size group for track-header ctrl buttons"
This reverts commit 86eb72955c76575b75a2b9e535162ca7e0612bfd.
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/time_axis_view.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/time_axis_view.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index e3337d888c..43c68cf5de 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -75,12 +75,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) @@ -108,9 +108,6 @@ 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 (); } diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index 5125387e0f..3d5bad68c8 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -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; |