Fix double escape to close a window

project-gauntlet · Feb 22, 2024 · ac0dea8 · ac0dea8
1 parent 81c12fc
commit ac0dea8
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/rust/client/src/ui/mod.rs b/rust/client/src/ui/mod.rs
@@ -393,6 +393,14 @@ impl Application for AppModel {
         struct RequestLoop;
         struct GlobalShortcutListener;
 
+        let events_subscription = event::listen_with(|event, status| match status {
+            event::Status::Ignored => Some(AppMsg::IcedEvent(event)),
+            event::Status::Captured => match event {
+                Event::Keyboard(keyboard::Event::KeyPressed { key: Key::Named(Named::Escape), .. }) => Some(AppMsg::IcedEvent(event)),
+                _ => None
+            }
+        });
+
         Subscription::batch([
             subscription::channel(
                 std::any::TypeId::of::<GlobalShortcutListener>(),
@@ -405,7 +413,7 @@ impl Application for AppModel {
                     unreachable!()
                 },
             ),
-            event::listen().map(AppMsg::IcedEvent),
+            events_subscription,
             subscription::channel(
                 std::any::TypeId::of::<RequestLoop>(),
                 100,