aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgnisman <gleb.nisman@gmail.com>2023-01-20 23:18:01 +0200
committerGitHub <noreply@github.com>2023-01-20 22:18:01 +0100
commita76eaf9a9ab042e05841d1369c2e466a4f63a48f (patch)
tree2311b7fba0b5b6d8f3c2a99afd8d9d8a4d08e5f0
parent009e6bcd1b4d55f511fc947d2d029f3f68b50d5d (diff)
Ava UI: Add Control+Cmd+F HotKey for Mac OS (#4317)1.1.578
* Ava UI: Add Control+Cmd+F HotKey for Mac OS * fix aligned * Remove comment from code
-rw-r--r--Ryujinx.Ava/UI/Windows/MainWindow.axaml1
-rw-r--r--Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs9
2 files changed, 6 insertions, 4 deletions
diff --git a/Ryujinx.Ava/UI/Windows/MainWindow.axaml b/Ryujinx.Ava/UI/Windows/MainWindow.axaml
index c3d34e75..08b99cf5 100644
--- a/Ryujinx.Ava/UI/Windows/MainWindow.axaml
+++ b/Ryujinx.Ava/UI/Windows/MainWindow.axaml
@@ -43,6 +43,7 @@
<StackPanel Grid.Row="0" IsVisible="False">
<helpers:HotKeyControl Name="FullscreenHotKey" Command="{ReflectionBinding ToggleFullscreen}" />
<helpers:HotKeyControl Name="FullscreenHotKey2" Command="{ReflectionBinding ToggleFullscreen}" />
+ <helpers:HotKeyControl Name="FullscreenHotKeyMacOS" Command="{ReflectionBinding ToggleFullscreen}" />
<helpers:HotKeyControl Name="DockToggleHotKey" Command="{ReflectionBinding ToggleDockMode}" />
<helpers:HotKeyControl Name="ExitHotKey" Command="{ReflectionBinding ExitCurrentState}" />
</StackPanel>
diff --git a/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs b/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs
index 6864e643..dcd89ac0 100644
--- a/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs
+++ b/Ryujinx.Ava/UI/Windows/MainWindow.axaml.cs
@@ -327,10 +327,11 @@ namespace Ryujinx.Ava.UI.Windows
public void LoadHotKeys()
{
- HotKeyManager.SetHotKey(FullscreenHotKey, new KeyGesture(Key.Enter, KeyModifiers.Alt));
- HotKeyManager.SetHotKey(FullscreenHotKey2, new KeyGesture(Key.F11));
- HotKeyManager.SetHotKey(DockToggleHotKey, new KeyGesture(Key.F9));
- HotKeyManager.SetHotKey(ExitHotKey, new KeyGesture(Key.Escape));
+ HotKeyManager.SetHotKey(FullscreenHotKey, new KeyGesture(Key.Enter, KeyModifiers.Alt));
+ HotKeyManager.SetHotKey(FullscreenHotKey2, new KeyGesture(Key.F11));
+ HotKeyManager.SetHotKey(FullscreenHotKeyMacOS, new KeyGesture(Key.F, KeyModifiers.Control | KeyModifiers.Meta));
+ HotKeyManager.SetHotKey(DockToggleHotKey, new KeyGesture(Key.F9));
+ HotKeyManager.SetHotKey(ExitHotKey, new KeyGesture(Key.Escape));
}
private void VolumeStatus_CheckedChanged(object sender, SplitButtonClickEventArgs e)