From c9949a0399d329e9385230b92f51e62d79907dfd Mon Sep 17 00:00:00 2001 From: nikolay Date: Tue, 22 Jul 2014 17:48:49 +0300 Subject: [PATCH] [Summary] Fix bug in Track Header (on OS Windows). In the past Shift+Click set SoloButton in Solo Save Mode. Now Ctrl+Click set Solo Button in Solo Save Mode (according to PRD). [Review] Nobody --- gtk2_ardour/route_ui.cc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 237b1df254..aaa8543117 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -376,6 +376,15 @@ RouteUI::solo_press(GdkEventButton* ev) multiple_solo_change = false; + int control_modifier; +#ifdef __APPLE__ + control_modifier = Keyboard::SecondaryModifier; +#endif + +#ifdef _WIN32 + control_modifier = Keyboard::PrimaryModifier; +#endif + if (!_i_am_the_modifier) { if (Keyboard::is_context_menu_event (ev)) { if (solo_menu == 0) { @@ -432,7 +441,7 @@ RouteUI::solo_press(GdkEventButton* ev) _session->set_just_one_solo (_route, true); } - } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) { + } else if (Keyboard::modifier_state_equals (ev->state, control_modifier)) { // control-click (SecondaryModifier): toggle solo isolated status