From 7cb1219df81e373eb15a3ecc17bca65de4c27526 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Wed, 14 Feb 2018 12:55:48 -0600 Subject: Re-pack dsp_load_indicator next to feedback_indicator et al. --- gtk2_ardour/ardour_ui.h | 2 ++ gtk2_ardour/ardour_ui2.cc | 40 +++++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 19 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index bef477cbbb..db7bfa95b2 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -493,6 +493,8 @@ private: DspLoadIndicator dsp_load_indicator; DiskSpaceIndicator disk_space_indicator; + ArdourWidgets::ArdourVSpacer status_spacer; + ArdourWidgets::ArdourButton auto_return_button; ArdourWidgets::ArdourButton follow_edits_button; ArdourWidgets::ArdourButton sync_button; diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index ef0c8fffcd..54d2a8416b 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -172,6 +172,27 @@ bool drag_failed (const Glib::RefPtr& context, DragResult resu void ARDOUR_UI::repack_transport_hbox () { + if (dsp_load_indicator.get_parent()) { + transport_hbox.remove (dsp_load_indicator); + } + if (UIConfiguration::instance().get_show_dsp_load_info ()) { + transport_hbox.pack_start (dsp_load_indicator, false, false); + dsp_load_indicator.show(); + } + + if (disk_space_indicator.get_parent()) { + transport_hbox.remove (disk_space_indicator); + } + if (UIConfiguration::instance().get_show_disk_space_info ()) { + transport_hbox.pack_start (disk_space_indicator, false, false); + disk_space_indicator.show(); + } + + if (status_spacer.get_parent()) { + transport_hbox.remove (status_spacer); + } + transport_hbox.pack_start (status_spacer, false, false, 3); + if (time_info_box) { if (time_info_box->get_parent()) { transport_hbox.remove (*time_info_box); @@ -190,22 +211,6 @@ ARDOUR_UI::repack_transport_hbox () mini_timeline.show(); } - if (dsp_load_indicator.get_parent()) { - transport_hbox.remove (dsp_load_indicator); - } - if (UIConfiguration::instance().get_show_dsp_load_info ()) { - transport_hbox.pack_start (dsp_load_indicator, false, false); - dsp_load_indicator.show(); - } - - if (disk_space_indicator.get_parent()) { - transport_hbox.remove (disk_space_indicator); - } - if (UIConfiguration::instance().get_show_disk_space_info ()) { - transport_hbox.pack_start (disk_space_indicator, false, false); - disk_space_indicator.show(); - } - if (editor_meter) { if (meter_box.get_parent()) { transport_hbox.remove (meter_box); @@ -553,9 +558,6 @@ ARDOUR_UI::setup_transport () transport_table.attach (*alert_box, TCOL, 0, 2, SHRINK, EXPAND|FILL, hpadding, 0); ++col; - transport_table.attach (*(manage (new ArdourVSpacer ())), TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0); - ++col; - /* editor-meter, mini-timeline and selection clock are options in the transport_hbox */ transport_hbox.set_spacing (3); transport_table.attach (transport_hbox, TCOL, 0, 2, EXPAND|FILL, EXPAND|FILL, hpadding, 0); -- cgit v1.2.3