smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 06:44:57 +01:00
Code Issues Projects Releases Wiki Activity

Revert "use a gloabl size group for track-header ctrl buttons"

Browse source 
This reverts commit 86eb72955c.
This commit is contained in:
Robin Gareus 2014-09-06 03:36:01 +02:00
parent dfecb06946
commit 028346d412
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gtk2_ardour/time_axis_view.cc
View file

@ -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 ();
}

2
gtk2_ardour/time_axis_view.h
View 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;