From 94ae6480887b66b604aa0a4b14924e0777828fb0 Mon Sep 17 00:00:00 2001
From: Colin Fletcher <colin.m.fletcher@googlemail.com>
Date: Sun, 22 May 2022 18:55:42 +0100
Subject: [PATCH] gtk2_ardour: only allow shift+click to disengage fader from
 group

Don't invert the groups gain sharing setting when the fader is
shift+clicked: only allow shift to disable grouped gain changes when the
group is active.
---
 gtk2_ardour/gain_meter.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 577b5d4009..22e4469aff 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -583,11 +583,10 @@ GainMeterBase::fader_moved ()
 			value = gain_adjustment.get_value();
 		}
 
-		// XXX hack allow to override group
-		// (this breaks group'ed  shift+click reset)
+		// XXX hack allow to override group if active
 		if (Keyboard::the_keyboard().key_is_down (GDK_Shift_R)
 				|| Keyboard::the_keyboard().key_is_down (GDK_Shift_L)) {
-			_control->set_value (value, Controllable::InverseGroup);
+			_control->set_value (value, Controllable::NoGroup);
 		} else {
 			_control->set_value (value, Controllable::UseGroup);
 		}
-- 
2.30.2

From 9cf65b63390a32f770a96fde9436b8d14e41e6b7 Mon Sep 17 00:00:00 2001
From: Colin Fletcher <colin.m.fletcher@googlemail.com>
Date: Fri, 15 Jul 2022 17:35:26 +0100
Subject: [PATCH] gtk2_ardour: only allow shift+click to disengage fader from
 group

Don't invert the group's gain sharing setting when the fader is
shift+clicked: only allow the group override modifier key to disable
grouped gain changes when the group is active, not to enable them when the
group is inactive.
---
 gtk2_ardour/gain_meter.cc | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 5e101dac77..a2cac0f844 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -584,11 +584,7 @@ GainMeterBase::fader_moved ()
 		}
 
 		if (Keyboard::the_keyboard().modifier_state() == Keyboard::group_override_modifier ()) {
-			if (Config->get_group_override_inverts ()) {
-				_control->set_value (value, Controllable::InverseGroup);
-			} else {
-				_control->set_value (value, Controllable::NoGroup);
-			}
+			_control->set_value (value, Controllable::NoGroup);
 		} else {
 			_control->set_value (value, Controllable::UseGroup);
 		}
-- 
2.30.2

From 53d592b836a649e0312c46a5946b35cf007bf49f Mon Sep 17 00:00:00 2001
From: Colin Fletcher <colin.m.fletcher@googlemail.com>
Date: Sat, 23 Jul 2022 15:43:33 +0100
Subject: [PATCH 2/2] gtk2_ardour: disable "reset to default" on shift-click
 for grouped routes

If a fader of a grouped route is shift-clicked, set its NoResetDefault
tweak bit so that shift only has the effect of "override group". If the
route is not part of a group, ensure the tweak bit is cleared.
---
 gtk2_ardour/gain_meter.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 5e101dac77..d4f18de777 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -584,6 +584,12 @@ GainMeterBase::fader_moved ()
 		}
 
 		if (Keyboard::the_keyboard().modifier_state() == Keyboard::group_override_modifier ()) {
+			ArdourFader::Tweaks tweaks = gain_slider->tweaks();
+			if (_route->route_group())
+				gain_slider->set_tweaks (ArdourFader::Tweaks(tweaks | ArdourFader::NoResetDefault));
+			else
+				gain_slider->set_tweaks (ArdourFader::Tweaks(tweaks & ~ArdourFader::NoResetDefault));
+
 			if (Config->get_group_override_inverts ()) {
 				_control->set_value (value, Controllable::InverseGroup);
 			} else {
-- 
2.30.2

From 1ca545db5e2a8a4ef858cbb40b4fca56e81334dd Mon Sep 17 00:00:00 2001
From: Colin Fletcher <colin.m.fletcher@googlemail.com>
Date: Sat, 23 Jul 2022 15:40:45 +0100
Subject: [PATCH 1/2] libs/widgets: allow fader to opt out of shift+click
 "reset to default"

Add a tweak value to ArdourFader::Tweaks that will disable the action of
resetting the fader to its default value on shift+click when set.
---
 libs/widgets/ardour_fader.cc        | 3 ++-
 libs/widgets/widgets/ardour_fader.h | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/widgets/ardour_fader.cc b/libs/widgets/ardour_fader.cc
index b414e27883..54e14c9522 100644
--- a/libs/widgets/ardour_fader.cc
+++ b/libs/widgets/ardour_fader.cc
@@ -464,7 +464,8 @@ ArdourFader::on_button_release_event (GdkEventButton* ev)
 				ev_pos = rint(ev_pos);
 
 				if (ev->state & Keyboard::TertiaryModifier) {
-					_adjustment.set_value (_default_value);
+					if (!(tweaks() & NoResetDefault))
+						_adjustment.set_value (_default_value);
 				} else if (ev->state & Keyboard::GainFineScaleModifier) {
 					_adjustment.set_value (_adjustment.get_lower());
 #if 0 // ignore clicks
diff --git a/libs/widgets/widgets/ardour_fader.h b/libs/widgets/widgets/ardour_fader.h
index 31ca47d6c1..9029e5572d 100644
--- a/libs/widgets/widgets/ardour_fader.h
+++ b/libs/widgets/widgets/ardour_fader.h
@@ -49,6 +49,7 @@ public:
 		NoShowUnityLine = 0x1,
 		NoButtonForward = 0x2,
 		NoVerticalScroll = 0x4,
+		NoResetDefault = 0x08,
 	};
 
 	Tweaks tweaks() const { return _tweaks; }
-- 
2.30.2