From 00c213727cf9d6854b87f263591f4597660f3f7b Mon Sep 17 00:00:00 2001 From: Ryan Fraser Date: Wed, 14 Oct 2026 09:54:08 -0500 Subject: [PATCH] fix: macOS keyboard conventions - Settings toggle uses Cmd+O on macOS (Ctrl+O elsewhere) - Search box no longer captures keypresses held with Cmd Co-Authored-By: Claude Opus 5.5 --- scripts/ui/SettingsMenu.cs | 2 +- scripts/ui/menu/play/SearchPanel.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ui/SettingsMenu.cs b/scripts/ui/SettingsMenu.cs index b4e57bfc..50c9dd22 100644 --- a/scripts/ui/SettingsMenu.cs +++ b/scripts/ui/SettingsMenu.cs @@ -238,7 +238,7 @@ public override void _Input(InputEvent @event) switch (eventKey.Keycode) { case Key.O: - if (eventKey.CtrlPressed) + if (eventKey.IsCommandOrControlPressed()) { ShowMenu(!Shown); GetViewport().SetInputAsHandled(); diff --git a/scripts/ui/menu/play/SearchPanel.cs b/scripts/ui/menu/play/SearchPanel.cs index 56949793..25493204 100644 --- a/scripts/ui/menu/play/SearchPanel.cs +++ b/scripts/ui/menu/play/SearchPanel.cs @@ -23,7 +23,7 @@ public override void _Ready() public override void _Input(InputEvent @event) { - if (@event is InputEventKey eventKey && eventKey.Pressed && !eventKey.CtrlPressed && !eventKey.AltPressed) + if (@event is InputEventKey eventKey && eventKey.Pressed && !eventKey.CtrlPressed && !eventKey.MetaPressed && !eventKey.AltPressed) { Control focusOwner = GetViewport().GuiGetFocusOwner();