From c2b026831c5a7229e8ee2b53ba0406223e1fc016 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 3 Apr 2020 18:54:22 -0600 Subject: [PATCH] yes, RouteTimeAxisView::set_layer_display() really never applies to the selection --- gtk2_ardour/route_time_axis.cc | 21 ++++++++------------- gtk2_ardour/route_time_axis.h | 2 +- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 4d24e73bf8..5af14987ee 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -186,7 +186,7 @@ RouteTimeAxisView::set_route (boost::shared_ptr rt) route_group_button.set_name ("route button"); playlist_button.set_name ("route button"); automation_button.set_name ("route button"); - + route_group_button.signal_button_press_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::route_group_click), false); playlist_button.signal_button_press_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::playlist_click), false); automation_button.signal_button_press_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::automation_click), false); @@ -859,9 +859,9 @@ RouteTimeAxisView::layer_display_menu_change (Gtk::MenuItem* item) if (dynamic_cast(item)->get_active()) { if (item == stacked_menu_item) { - set_layer_display (Stacked, false); + set_layer_display (Stacked); } else { - set_layer_display (Overlaid, false); + set_layer_display (Overlaid); } } } @@ -2324,22 +2324,17 @@ RouteTimeAxisView::toggle_layer_display () } void -RouteTimeAxisView::set_layer_display (LayerDisplay d, bool apply_to_selection) +RouteTimeAxisView::set_layer_display (LayerDisplay d) { if (_ignore_set_layer_display) { return; } - if (apply_to_selection) { - _editor.get_selection().tracks.foreach_route_time_axis (boost::bind (&RouteTimeAxisView::set_layer_display, _1, d, false)); - } else { - - if (_view) { - _view->set_layer_display (d); - } - - set_gui_property (X_("layer-display"), d); + if (_view) { + _view->set_layer_display (d); } + + set_gui_property (X_("layer-display"), d); } LayerDisplay diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h index 72b6f736a1..903f745ca9 100644 --- a/gtk2_ardour/route_time_axis.h +++ b/gtk2_ardour/route_time_axis.h @@ -102,7 +102,7 @@ public: void set_selected_regionviews (RegionSelection&); void get_selectables (ARDOUR::samplepos_t start, ARDOUR::samplepos_t end, double top, double bot, std::list&, bool within = false); void get_inverted_selectables (Selection&, std::list&); - void set_layer_display (LayerDisplay d, bool apply_to_selection = false); + void set_layer_display (LayerDisplay d); void toggle_layer_display (); LayerDisplay layer_display () const;