desktop: Fix open advanced shortcut

egui expects most specific shortcuts to be checked first, previously <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>O</kbd> would open the normal file dialog.
ruffle-rs · Jul 8, 2024 · ab9bbd3 · ab9bbd3
1 parent 62fd898
commit ab9bbd3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/desktop/src/gui/menu_bar.rs b/desktop/src/gui/menu_bar.rs
@@ -44,14 +44,14 @@ impl MenuBar {
         egui::TopBottomPanel::top("menu_bar").show(egui_ctx, |ui| {
             // TODO(mike): Make some MenuItem struct with shortcut info to handle this more cleanly.
             if ui.ctx().input_mut(|input| {
-                input.consume_shortcut(&KeyboardShortcut::new(Modifiers::COMMAND, Key::O))
+                input.consume_shortcut(&KeyboardShortcut::new(Modifiers::COMMAND | Modifiers::SHIFT, Key::O))
             }) {
-                self.open_file(ui);
+                dialogs.open_file_advanced();
             }
             if ui.ctx().input_mut(|input| {
-                input.consume_shortcut(&KeyboardShortcut::new(Modifiers::COMMAND | Modifiers::SHIFT, Key::O))
+                input.consume_shortcut(&KeyboardShortcut::new(Modifiers::COMMAND, Key::O))
             }) {
-                dialogs.open_file_advanced();
+                self.open_file(ui);
             }
             if ui.ctx().input_mut(|input| {
                 input.consume_shortcut(&KeyboardShortcut::new(Modifiers::COMMAND, Key::Q))