diff options
| author | 2020-06-25 22:54:05 +0200 | |
|---|---|---|
| committer | 2020-06-27 11:30:32 +0200 | |
| commit | 323eb86c9fc5ad415b7a33c0f0699aa7a1095e4b (patch) | |
| tree | 49eb8961fa8ce0acf29ca275b1da42256320ef24 | |
| parent | Merge pull request #4141 from Morph1984/SevenSixAxisSensor (diff) | |
| download | yuzu-323eb86c9fc5ad415b7a33c0f0699aa7a1095e4b.tar.gz yuzu-323eb86c9fc5ad415b7a33c0f0699aa7a1095e4b.tar.xz yuzu-323eb86c9fc5ad415b7a33c0f0699aa7a1095e4b.zip | |
Fix issues caused when changing the fullscreen hotkey
| -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 059b96e70..0820f8c7e 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -666,6 +666,11 @@ void GMainWindow::InitializeHotkeys() { | |||
| 666 | ui.action_Capture_Screenshot->setShortcutContext( | 666 | ui.action_Capture_Screenshot->setShortcutContext( |
| 667 | hotkey_registry.GetShortcutContext(main_window, capture_screenshot)); | 667 | hotkey_registry.GetShortcutContext(main_window, capture_screenshot)); |
| 668 | 668 | ||
| 669 | ui.action_Fullscreen->setShortcut( | ||
| 670 | hotkey_registry.GetHotkey(main_window, fullscreen, this)->key()); | ||
| 671 | ui.action_Fullscreen->setShortcutContext( | ||
| 672 | hotkey_registry.GetShortcutContext(main_window, fullscreen)); | ||
| 673 | |||
| 669 | connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Load File"), this), | 674 | connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Load File"), this), |
| 670 | &QShortcut::activated, this, &GMainWindow::OnMenuLoadFile); | 675 | &QShortcut::activated, this, &GMainWindow::OnMenuLoadFile); |
| 671 | connect( | 676 | connect( |
| @@ -849,10 +854,6 @@ void GMainWindow::ConnectMenuEvents() { | |||
| 849 | connect(ui.action_Reset_Window_Size, &QAction::triggered, this, &GMainWindow::ResetWindowSize); | 854 | connect(ui.action_Reset_Window_Size, &QAction::triggered, this, &GMainWindow::ResetWindowSize); |
| 850 | 855 | ||
| 851 | // Fullscreen | 856 | // Fullscreen |
| 852 | ui.action_Fullscreen->setShortcut( | ||
| 853 | hotkey_registry | ||
| 854 | .GetHotkey(QStringLiteral("Main Window"), QStringLiteral("Fullscreen"), this) | ||
| 855 | ->key()); | ||
| 856 | connect(ui.action_Fullscreen, &QAction::triggered, this, &GMainWindow::ToggleFullscreen); | 857 | connect(ui.action_Fullscreen, &QAction::triggered, this, &GMainWindow::ToggleFullscreen); |
| 857 | 858 | ||
| 858 | // Movie | 859 | // Movie |