From 9b8fbeb08768f538d87958bd4695768942ff588b Mon Sep 17 00:00:00 2001 From: Albert Liu <45282415+ggrtk@users.noreply.github.com> Date: Mon, 19 Oct 2020 16:35:12 -0700 Subject: [PATCH] CommonHostInterface: Activate hotkeys on press instead of release --- src/frontend-common/common_host_interface.cpp | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/frontend-common/common_host_interface.cpp b/src/frontend-common/common_host_interface.cpp index 2c2c3dfe6..fcbc12ce7 100644 --- a/src/frontend-common/common_host_interface.cpp +++ b/src/frontend-common/common_host_interface.cpp @@ -1363,7 +1363,7 @@ void CommonHostInterface::RegisterGeneralHotkeys() RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "General")), StaticString("ToggleFastForward"), StaticString(TRANSLATABLE("Hotkeys", "Toggle Fast Forward")), [this](bool pressed) { - if (!pressed) + if (pressed) { m_speed_limiter_temp_disabled = !m_speed_limiter_temp_disabled; UpdateSpeedLimiterState(); @@ -1376,19 +1376,19 @@ void CommonHostInterface::RegisterGeneralHotkeys() RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "General")), StaticString("ToggleFullscreen"), StaticString(TRANSLATABLE("Hotkeys", "Toggle Fullscreen")), [this](bool pressed) { - if (!pressed) + if (pressed) SetFullscreen(!IsFullscreen()); }); RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "General")), StaticString("TogglePause"), StaticString(TRANSLATABLE("Hotkeys", "Toggle Pause")), [this](bool pressed) { - if (System::IsValid() && !pressed) + if (pressed && System::IsValid()) PauseSystem(!System::IsPaused()); }); RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "General")), StaticString("PowerOff"), StaticString(TRANSLATABLE("Hotkeys", "Power Off System")), [this](bool pressed) { - if (!pressed && System::IsValid()) + if (pressed && System::IsValid()) { if (g_settings.confim_power_off && !m_batch_mode) { @@ -1414,19 +1414,19 @@ void CommonHostInterface::RegisterGeneralHotkeys() RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "General")), StaticString("Reset"), StaticString(TRANSLATABLE("Hotkeys", "Reset System")), [this](bool pressed) { - if (!pressed && System::IsValid()) + if (pressed && System::IsValid()) ResetSystem(); }); RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "General")), StaticString("Screenshot"), StaticString(TRANSLATABLE("Hotkeys", "Save Screenshot")), [this](bool pressed) { - if (!pressed && System::IsValid()) + if (pressed && System::IsValid()) SaveScreenshot(); }); RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "General")), StaticString("FrameStep"), StaticString(TRANSLATABLE("Hotkeys", "Frame Step")), [this](bool pressed) { - if (!pressed) + if (pressed) { DoFrameStep(); } @@ -1437,13 +1437,13 @@ void CommonHostInterface::RegisterGraphicsHotkeys() { RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "Graphics")), StaticString("ToggleSoftwareRendering"), StaticString(TRANSLATABLE("Hotkeys", "Toggle Software Rendering")), [this](bool pressed) { - if (!pressed) + if (pressed) ToggleSoftwareRendering(); }); RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "Graphics")), StaticString("TogglePGXP"), StaticString(TRANSLATABLE("Hotkeys", "Toggle PGXP")), [this](bool pressed) { - if (!pressed) + if (pressed) { g_settings.gpu_pgxp_enable = !g_settings.gpu_pgxp_enable; g_gpu->UpdateSettings(); @@ -1465,25 +1465,25 @@ void CommonHostInterface::RegisterGraphicsHotkeys() RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "Graphics")), StaticString("IncreaseResolutionScale"), StaticString(TRANSLATABLE("Hotkeys", "Increase Resolution Scale")), [this](bool pressed) { - if (!pressed) + if (pressed) ModifyResolutionScale(1); }); RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "Graphics")), StaticString("DecreaseResolutionScale"), StaticString(TRANSLATABLE("Hotkeys", "Decrease Resolution Scale")), [this](bool pressed) { - if (!pressed) + if (pressed) ModifyResolutionScale(-1); }); RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "Graphics")), StaticString("TogglePostProcessing"), StaticString(TRANSLATABLE("Hotkeys", "Toggle Post-Processing")), [this](bool pressed) { - if (!pressed) + if (pressed) TogglePostProcessing(); }); RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "Graphics")), StaticString("ReloadPostProcessingShaders"), StaticString(TRANSLATABLE("Hotkeys", "Reload Post Processing Shaders")), [this](bool pressed) { - if (!pressed) + if (pressed) ReloadPostProcessingShaders(); }); } @@ -1492,22 +1492,22 @@ void CommonHostInterface::RegisterSaveStateHotkeys() { RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "Save States")), StaticString("LoadSelectedSaveState"), StaticString(TRANSLATABLE("Hotkeys", "Load From Selected Slot")), [this](bool pressed) { - if (!pressed) + if (pressed) m_save_state_selector_ui->LoadCurrentSlot(); }); RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "Save States")), StaticString("SaveSelectedSaveState"), StaticString(TRANSLATABLE("Hotkeys", "Save To Selected Slot")), [this](bool pressed) { - if (!pressed) + if (pressed) m_save_state_selector_ui->SaveCurrentSlot(); }); RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "Save States")), StaticString("SelectPreviousSaveStateSlot"), StaticString(TRANSLATABLE("Hotkeys", "Select Previous Save Slot")), [this](bool pressed) { - if (!pressed) + if (pressed) m_save_state_selector_ui->SelectPreviousSlot(); }); RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "Save States")), StaticString("SelectNextSaveStateSlot"), StaticString(TRANSLATABLE("Hotkeys", "Select Next Save Slot")), [this](bool pressed) { - if (!pressed) + if (pressed) m_save_state_selector_ui->SelectNextSlot(); }); @@ -1516,13 +1516,13 @@ void CommonHostInterface::RegisterSaveStateHotkeys() RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "Save States")), TinyString::FromFormat("LoadGameState%u", slot), TinyString::FromFormat("Load Game State %u", slot), [this, slot](bool pressed) { - if (!pressed) + if (pressed) LoadState(false, slot); }); RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "Save States")), TinyString::FromFormat("SaveGameState%u", slot), TinyString::FromFormat("Save Game State %u", slot), [this, slot](bool pressed) { - if (!pressed) + if (pressed) SaveState(false, slot); }); } @@ -1532,13 +1532,13 @@ void CommonHostInterface::RegisterSaveStateHotkeys() RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "Save States")), TinyString::FromFormat("LoadGlobalState%u", slot), TinyString::FromFormat("Load Global State %u", slot), [this, slot](bool pressed) { - if (!pressed) + if (pressed) LoadState(true, slot); }); RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "Save States")), TinyString::FromFormat("SaveGlobalState%u", slot), TinyString::FromFormat("Save Global State %u", slot), [this, slot](bool pressed) { - if (!pressed) + if (pressed) SaveState(true, slot); }); } @@ -1591,7 +1591,7 @@ void CommonHostInterface::RegisterAudioHotkeys() RegisterHotkey( StaticString(TRANSLATABLE("Hotkeys", "Audio")), StaticString("AudioMute"), StaticString(TRANSLATABLE("Hotkeys", "Toggle Mute")), [this](bool pressed) { - if (System::IsValid() && !pressed) + if (pressed && System::IsValid()) { g_settings.audio_output_muted = !g_settings.audio_output_muted; m_audio_stream->SetOutputVolume(g_settings.audio_output_muted ? 0 : g_settings.audio_output_volume); @@ -1603,7 +1603,7 @@ void CommonHostInterface::RegisterAudioHotkeys() }); RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "Audio")), StaticString("AudioCDAudioMute"), StaticString(TRANSLATABLE("Hotkeys", "Toggle CD Audio Mute")), [this](bool pressed) { - if (System::IsValid() && !pressed) + if (pressed && System::IsValid()) { g_settings.cdrom_mute_cd_audio = !g_settings.cdrom_mute_cd_audio; AddOSDMessage(g_settings.cdrom_mute_cd_audio ? @@ -1614,7 +1614,7 @@ void CommonHostInterface::RegisterAudioHotkeys() }); RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "Audio")), StaticString("AudioVolumeUp"), StaticString(TRANSLATABLE("Hotkeys", "Volume Up")), [this](bool pressed) { - if (System::IsValid() && pressed) + if (pressed && System::IsValid()) { g_settings.audio_output_volume = std::min(g_settings.audio_output_volume + 10, 100); g_settings.audio_output_muted = false; @@ -1625,7 +1625,7 @@ void CommonHostInterface::RegisterAudioHotkeys() }); RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "Audio")), StaticString("AudioVolumeDown"), StaticString(TRANSLATABLE("Hotkeys", "Volume Down")), [this](bool pressed) { - if (System::IsValid() && pressed) + if (pressed && System::IsValid()) { g_settings.audio_output_volume = std::max(g_settings.audio_output_volume - 10, 0); g_settings.audio_output_muted = false;