diff options
| author | Kewlan <colin_rehn@hotmail.com> | 2020-06-25 22:54:05 +0200 |
|---|---|---|
| committer | Kewlan <colin_rehn@hotmail.com> | 2020-06-27 11:30:32 +0200 |
| commit | 323eb86c9fc5ad415b7a33c0f0699aa7a1095e4b (patch) | |
| tree | 49eb8961fa8ce0acf29ca275b1da42256320ef24 /src | |
| parent | Merge pull request #4141 from Morph1984/SevenSixAxisSensor (diff) | |
| download | yuzu-323eb86c9fc5ad415b7a33c0f0699aa7a1095e4b.tar yuzu-323eb86c9fc5ad415b7a33c0f0699aa7a1095e4b.tar.gz yuzu-323eb86c9fc5ad415b7a33c0f0699aa7a1095e4b.tar.bz2 yuzu-323eb86c9fc5ad415b7a33c0f0699aa7a1095e4b.tar.lz yuzu-323eb86c9fc5ad415b7a33c0f0699aa7a1095e4b.tar.xz yuzu-323eb86c9fc5ad415b7a33c0f0699aa7a1095e4b.tar.zst yuzu-323eb86c9fc5ad415b7a33c0f0699aa7a1095e4b.zip | |
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 059b96e70..0820f8c7e 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -666,6 +666,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( @@ -849,10 +854,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 |