From b6ca43943b4e5b8a309586074483ff6a01c54bf4 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 25 Apr 2024 08:10:26 -0600 Subject: [PATCH] add the track visibility widgets to the toolbar --- gtk2_ardour/ardour_ui_dependents.cc | 1 + gtk2_ardour/editor.cc | 4 +++- gtk2_ardour/editor.h | 2 -- gtk2_ardour/public_editor.h | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index 23bcfc9ab4..74309a466e 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -494,6 +494,7 @@ ARDOUR_UI::livetrax_setup_windows () editor->_zoom_box.pack_start (*livetrax_view_in_folder_button, false, false, 12); livetrax_transport_bar.pack_end (editor->_zoom_box, false, false); + livetrax_transport_bar.pack_end (editor->_track_box, false, false); livetrax_transport_bar.show_all (); /* meter display */ diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index bb2bf49053..a5fdf1e14e 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -3566,7 +3566,9 @@ Editor::setup_toolbar () toolbar_hbox.pack_end (_zoom_box, false, false, 2); } toolbar_hbox.pack_end (*(manage (new ArdourVSpacer ())), false, false, 3); - toolbar_hbox.pack_end (_track_box, false, false); + if (!Profile->get_livetrax()) { + toolbar_hbox.pack_end (_track_box, false, false); + } toolbar_hbox.show_all (); } diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index c51f727c8a..49e40e0efe 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -2073,8 +2073,6 @@ private: void marker_click_behavior_chosen (Editing::MarkerClickBehavior); void marker_click_behavior_selection_done (Editing::MarkerClickBehavior); - Gtk::HBox _track_box; - void zoom_adjustment_changed(); void setup_toolbar (); diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index 7b68ab3213..c12cf6e9a6 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -605,6 +605,7 @@ public: virtual SelectionPropertiesBox& properties_box() const = 0; Gtk::HBox* mouse_mode_hbox; Gtk::HBox _zoom_box; + Gtk::HBox _track_box; /** the adjustment that controls the overall editor vertical scroll position */ Gtk::Adjustment vertical_adjustment; Gtk::Adjustment horizontal_adjustment;