allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Re-pack dsp_load_indicator next to feedback_indicator et al.

Browse Source
This commit is contained in:
Ben Loftis
2018-02-14 12:55:48 -06:00
parent f50c839ea8
commit 7cb1219df8
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/ardour_ui.h
View File

@@ -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;

40
gtk2_ardour/ardour_ui2.cc
View File

@@ -172,6 +172,27 @@ bool drag_failed (const Glib::RefPtr<Gdk::DragContext>& 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);