diff options
| author | bunnei <bunneidev@gmail.com> | 2020-06-29 23:11:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-29 23:11:57 -0400 |
| commit | fa8e35c49f2d0a74243fcba9416da70d6e08db07 (patch) | |
| tree | 810e91895676ada42ea1a1242b05232f54366599 /src | |
| parent | f84cbf6429926f5c0e9dcd7a7b26198d41343d4c (diff) | |
| parent | 323eb86c9fc5ad415b7a33c0f0699aa7a1095e4b (diff) | |
Merge pull request #4182 from Kewlan/fullscreen-hotkey-fix
hotkeys: Fix issues caused when changing the fullscreen hotkey
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/main.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 82625e67f1..880a6a06e2 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 |