From bc9b2f01f37318da1fc605e80c8eb010ee8fd971 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Wed, 18 Jan 2017 08:28:25 -0600 Subject: [PATCH] Shuffle the layout of new monitor section, so it is recognizably different than punch section; Standardize the button heights. --- gtk2_ardour/ardour_ui2.cc | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index cf17cf61b1..11a34771af 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -560,11 +560,22 @@ ARDOUR_UI::setup_transport () button_height_size_group->add_widget (stop_button); // button_height_size_group->add_widget (sync_button); -// button_height_size_group->add_widget (layered_button); button_height_size_group->add_widget (auto_return_button); + + //tab selections button_height_size_group->add_widget (editor_visibility_button); button_height_size_group->add_widget (mixer_visibility_button); + //punch section + button_height_size_group->add_widget (punch_in_button); + button_height_size_group->add_widget (punch_out_button); + button_height_size_group->add_widget (layered_button); + + //input monitoring section + button_height_size_group->add_widget (monitor_in_button); + button_height_size_group->add_widget (monitor_disk_button); + button_height_size_group->add_widget (auto_input_button); + Glib::RefPtr clock1_size_group = SizeGroup::create (SIZE_GROUP_BOTH); clock1_size_group->add_widget (*primary_clock->left_btn()); clock1_size_group->add_widget (*primary_clock->right_btn()); @@ -606,10 +617,10 @@ ARDOUR_UI::setup_transport () transport_table.attach (recpunch_spacer, TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); ++col; - transport_table.attach (monitor_in_button, col, col + 1, 0, 1 , FILL, SHRINK, 0, 2); - transport_table.attach (mon_space, col + 1, col + 2, 0, 1 , FILL, SHRINK, 2, 2); - transport_table.attach (monitor_disk_button, col + 2, col + 3, 0, 1 , FILL, SHRINK, 0, 2); - transport_table.attach (auto_input_button, col, col + 3, 1, 2 , FILL, SHRINK, 0, 2); + transport_table.attach (auto_input_button, col, col + 3, 0, 1 , FILL, SHRINK, 0, 2); + transport_table.attach (monitor_in_button, col, col + 1, 1, 2 , FILL, SHRINK, 0, 2); + transport_table.attach (mon_space, col + 1, col + 2, 1, 2 , FILL, SHRINK, 4, 2); + transport_table.attach (monitor_disk_button, col + 2, col + 3, 1, 2 , FILL, SHRINK, 0, 2); col += 3; transport_table.attach (monitoring_spacer, TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0);