Slightly improved keyboard event handling

Author: margual56

src/window.rs

@@ -857,8 +857,8 @@ impl MyApp {
                             ui.label(t!("lbl.resumed", lang));
                         }
                         let b = ui.button(text);
-                        // b.ctx.set_style(style);
-                        if (b.clicked() || ui.input(|i| i.key_pressed(egui::Key::Space)))
+                        
+                        if (b.clicked() || ui.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::Space)))
                             && !editor_focused
                         {
                             if self.tm.finished() {
@@ -894,28 +894,24 @@ impl eframe::App for MyApp {
         let lang = self.get_lang();
         let mut editor_focused = false;
 
-        ctx.input(|i| {
-            let ctrl_pressed = i.modifiers.ctrl || i.modifiers.command;
-
+        ctx.input_mut(|i| {
             // Check for keyboard shortcuts
-            if ctrl_pressed {
-                if i.key_down(egui::Key::S) {
-                    // Ctrl+S
-                    debug!("Saving...");
-                    self.save_file();
-                } else if i.key_down(egui::Key::O) {
-                    // Ctrl+O
-                    debug!("Opening...");
-                    self.load_file();
-                } else if i.modifiers.shift && i.key_down(egui::Key::S) {
-                    // Ctrl+Shift+S
-                    debug!("Saving as...");
-                    self.save_file_as();
-                } else if i.key_down(egui::Key::R) {
-                    // Ctrl+R
-                    debug!("Restarting...");
-                    self.tm = self.tm.restart(&self.code).unwrap();
-                }
+            if i.consume_shortcut(&egui::KeyboardShortcut::new(egui::Modifiers::COMMAND, egui::Key::S)){
+                // Ctrl+S
+                debug!("Saving...");
+                self.save_file();
+            } else if i.consume_shortcut(&egui::KeyboardShortcut::new(egui::Modifiers::COMMAND, egui::Key::O)) {
+                // Ctrl+O
+                debug!("Opening...");
+                self.load_file();
+            } else if i.modifiers.shift && i.consume_shortcut(&egui::KeyboardShortcut::new(egui::Modifiers::CTRL, egui::Key::S)) {
+                // Ctrl+Shift+S
+                debug!("Saving as...");
+                self.save_file_as();
+            } else if i.consume_shortcut(&egui::KeyboardShortcut::new(egui::Modifiers::COMMAND, egui::Key::R)) {
+                // Ctrl+R
+                debug!("Restarting...");
+                self.tm = self.tm.restart(&self.code).unwrap();
             }
         });