From 200360ee3e5e3bd3a24e04fedc4b9b52c242d474 Mon Sep 17 00:00:00 2001
From: MoonlightWave-12
 <135532-MoonlightWave-12@users.noreply.gitlab.gnome.org>
Date: Mon, 18 Nov 2024 13:41:48 +0100
Subject: [PATCH 1/2] input: Make it possible to deactivate a modifier with any
 button for it

Before this change,
one could only deactivate a modifier with the same button that was
used to activate it.
Pressing another button for the same modifier did not work.

Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/707>
---
 src/layout.rs     | 2 +-
 src/submission.rs | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/layout.rs b/src/layout.rs
index 6d85ef6a..75a5c942 100644
--- a/src/layout.rs
+++ b/src/layout.rs
@@ -1186,7 +1186,7 @@ mod seat {
                         key_id,
                         modifier, time,
                     ),
-                    false => submission.handle_drop_modifier(key_id, time),
+                    false => submission.handle_drop_modifier(key_id, modifier, time),
                 }
             }
             // only show when UI is present
diff --git a/src/submission.rs b/src/submission.rs
index 7a089d0f..ab525af6 100644
--- a/src/submission.rs
+++ b/src/submission.rs
@@ -228,10 +228,11 @@ impl Submission {
 
     pub fn handle_drop_modifier(
         &mut self,
-        key_id: KeyStateId,
+        _key_id: KeyStateId,
+        modifier: Modifier,
         _time: Timestamp,
     ) {
-        vec_remove(&mut self.modifiers_active, |(id, _)| *id == key_id);
+        vec_remove(&mut self.modifiers_active, |(_, m)| *m == modifier);
         self.update_modifiers();
     }
 

From 532b3f5da09ea4ccd4cb600b7ccf8113ba76eb8c Mon Sep 17 00:00:00 2001
From: MoonlightWave-12
 <135532-MoonlightWave-12@users.noreply.gitlab.gnome.org>
Date: Sat, 23 Nov 2024 14:54:07 +0100
Subject: [PATCH 2/2] treewide: Document changes and release 1.43.1

Part-of: <https://gitlab.gnome.org/World/Phosh/squeekboard/-/merge_requests/707>
---
 NEWS             | 8 ++++++++
 debian/changelog | 6 ++++++
 meson.build      | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 6955b719..499d90f1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+squeekboard 1.43.1
+------------------
+Released November 2024
+* Fixes:
+    * Input: Modifiers can now be deactivated with all buttons for the same modifier, instead of only with the same button that was used to activate it.
+* Contributors:
+    * MoonlightWave-12
+
 squeekboard 1.43.0
 ------------------
 Released November 2024
diff --git a/debian/changelog b/debian/changelog
index cd98d973..80a0e679 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+squeekboard (1.43.1) experimental; urgency=medium
+
+  * input: Make it possible to deactivate a modifier with any button for it
+
+ -- MoonlightWave-12 <135532-MoonlightWave-12@users.noreply.gitlab.gnome.org>  Sat, 23 Nov 2024 14:56:04 +0100
+
 squeekboard (1.43.0) experimental; urgency=medium
 
   [ MoonlightWave-12 ]
diff --git a/meson.build b/meson.build
index 892f6ea0..fef30ef6 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
     'squeekboard',
     'c', 'rust',
-    version: '1.43.0',
+    version: '1.43.1',
     license: 'GPLv3',
     meson_version: '>=1.0.0',
     default_options: [