Skip to content

fix: macOS keyboard conventions #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
notryanfraser wants to merge 1 commit into
base: indev
Choose a base branch
from
Open

fix: macOS keyboard conventions #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/ui/SettingsMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion scripts/ui/menu/play/SearchPanel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down