fix: better handling of cancelled edit

Author: wash2

Cargo.lock

@@ -74,10 +74,10 @@ cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//",
 # cosmic-config = { git = "https://github.com/pop-os/libcosmic//", rev = "8c4cb2e" }
 # cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", rev = "8c4cb2e" }
 # iced_futures = { git = "https://github.com/pop-os/libcosmic//", rev = "8c4cb2e" }
-# libcosmic = { path = "../libcosmic" }
-# cosmic-config = { path = "../libcosmic/cosmic-config" }
-# cosmic-theme = { path = "../libcosmic/cosmic-theme" }
-# iced_futures = { path = "../libcosmic/iced/futures" }
+libcosmic = { path = "../libcosmic" }
+cosmic-config = { path = "../libcosmic/cosmic-config" }
+cosmic-theme = { path = "../libcosmic/cosmic-theme" }
+iced_futures = { path = "../libcosmic/iced/futures" }
 
 # [patch.'https://github.com/pop-os/dbus-settings-bindings']
 # cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }

Cargo.toml

@@ -3,6 +3,7 @@
 
 use cosmic::app::ContextDrawer;
 use cosmic::iced::event::listen_with;
+use cosmic::iced::keyboard::key::Named;
 use cosmic::iced::keyboard::{Key, Location, Modifiers};
 use cosmic::iced::{self, Alignment, Length};
 use cosmic::widget::{self, button, icon, settings, text};
@@ -32,7 +33,7 @@ pub enum ShortcutMessage {
     ProtocolUnavailable,
     ModifiersChanged(Modifiers),
     KeyReleased(u32, Key, Location),
-    KeyPressed(u32, Key, Location),
+    KeyPressed(u32, Key, Location, Modifiers),
 }
 
 #[derive(Debug)]
@@ -421,6 +422,20 @@ impl Model {
                 }
             }
             ShortcutMessage::EditBinding(id, enable) => {
+                if !enable && self.editing == Some(id) {
+                    self.editing = None;
+                    if let Some(short_id) = self.shortcut_context {
+                        if let Some(model) = self.shortcut_models.get_mut(short_id) {
+                            if let Some(shortcut) = model.bindings.get_mut(id) {
+                                shortcut.pending = shortcut.binding.clone();
+                            }
+                        }
+                    }
+                    return Task::batch(vec![
+                        cosmic::widget::text_input::focus(self.add_keybindings_button_id.clone()),
+                        iced_winit::platform_specific::commands::keyboard_shortcuts_inhibit::inhibit_shortcuts(false).discard()
+                    ]);
+                }
                 if let Some(short_id) = self.shortcut_context {
                     if let Some(model) = self.shortcut_models.get_mut(short_id) {
                         if let Some(shortcut) = model.bindings.get_mut(id) {
@@ -479,7 +494,7 @@ impl Model {
 
                 return Task::batch(tasks);
             }
-            ShortcutMessage::SubmitBinding(id) => {}
+            ShortcutMessage::SubmitBinding(_) => {}
             ShortcutMessage::ProtocolUnavailable => {
                 tracing::error!("shortcut inhibit protocol is unavailable");
             }
@@ -514,6 +529,7 @@ impl Model {
                                     iced_winit::platform_specific::commands::keyboard_shortcuts_inhibit::inhibit_shortcuts(false).discard()
                                 ]);
                             }
+                            shortcut.input = shortcut.pending.to_string();
                         }
                     }
                 }
@@ -547,7 +563,22 @@ impl Model {
                     }
                 }
             }
-            ShortcutMessage::KeyPressed(keycode, unmodified_keysym, location) => {
+            ShortcutMessage::KeyPressed(keycode, unmodified_keysym, location, modifiers) => {
+                if unmodified_keysym == Key::Named(Named::Escape) && modifiers.is_empty() {
+                    if let Some((short_id, id)) = self.shortcut_context.zip(self.editing) {
+                        if let Some(model) = self.shortcut_models.get_mut(short_id) {
+                            if let Some(binding) = model.bindings.get_mut(id) {
+                                binding.reset();
+                                self.editing = None;
+                                return Task::batch(vec![
+                                    cosmic::widget::text_input::focus(self.add_keybindings_button_id.clone()),
+                                    iced_winit::platform_specific::commands::keyboard_shortcuts_inhibit::inhibit_shortcuts(false).discard()
+                                ]);
+                            }
+                        }
+                    }
+                    return Task::none();
+                }
                 if let Some((short_id, id)) = self.shortcut_context.zip(self.editing) {
                     if let Some(model) = self.shortcut_models.get_mut(short_id) {
                         if let Some(shortcut) = model.bindings.get_mut(id) {
@@ -577,6 +608,7 @@ impl Model {
                     key,
                     physical_key,
                     location,
+                    modifiers,
                     ..
                 }) => {
                     use cosmic::iced::keyboard::{Key, key::Named};
@@ -588,7 +620,7 @@ impl Model {
                         return None;
                     }
                     cosmic::iced_winit::conversion::physical_to_scancode(physical_key)
-                        .map(|code| ShortcutMessage::KeyPressed(code, key, location))
+                        .map(|code| ShortcutMessage::KeyPressed(code, key, location, modifiers))
                 }
                 iced::event::Event::Keyboard(iced::keyboard::Event::KeyReleased {
                     key,