summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-06-30 05:11:57 +0200
committerGitHub <noreply@github.com>2020-06-30 05:11:57 +0200
commitfa8e35c49f2d0a74243fcba9416da70d6e08db07 (patch)
tree810e91895676ada42ea1a1242b05232f54366599 /src
parentMerge pull request #4140 from ReinUsesLisp/validation-layers (diff)
parentFix issues caused when changing the fullscreen hotkey (diff)
downloadyuzu-fa8e35c49f2d0a74243fcba9416da70d6e08db07.tar
yuzu-fa8e35c49f2d0a74243fcba9416da70d6e08db07.tar.gz
yuzu-fa8e35c49f2d0a74243fcba9416da70d6e08db07.tar.bz2
yuzu-fa8e35c49f2d0a74243fcba9416da70d6e08db07.tar.lz
yuzu-fa8e35c49f2d0a74243fcba9416da70d6e08db07.tar.xz
yuzu-fa8e35c49f2d0a74243fcba9416da70d6e08db07.tar.zst
yuzu-fa8e35c49f2d0a74243fcba9416da70d6e08db07.zip
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/main.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 82625e67f..880a6a06e 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -689,6 +689,11 @@ void GMainWindow::InitializeHotkeys() {
ui.action_Capture_Screenshot->setShortcutContext(
hotkey_registry.GetShortcutContext(main_window, capture_screenshot));
+ ui.action_Fullscreen->setShortcut(
+ hotkey_registry.GetHotkey(main_window, fullscreen, this)->key());
+ ui.action_Fullscreen->setShortcutContext(
+ hotkey_registry.GetShortcutContext(main_window, fullscreen));
+
connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Load File"), this),
&QShortcut::activated, this, &GMainWindow::OnMenuLoadFile);
connect(
@@ -876,10 +881,6 @@ void GMainWindow::ConnectMenuEvents() {
connect(ui.action_Reset_Window_Size, &QAction::triggered, this, &GMainWindow::ResetWindowSize);
// Fullscreen
- ui.action_Fullscreen->setShortcut(
- hotkey_registry
- .GetHotkey(QStringLiteral("Main Window"), QStringLiteral("Fullscreen"), this)
- ->key());
connect(ui.action_Fullscreen, &QAction::triggered, this, &GMainWindow::ToggleFullscreen);
// Movie