piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

DolphinQt: Give hotkeys their own "background input" setting.

Browse Source
This commit is contained in:
Jordan Woyak
2020-02-07 17:56:13 -06:00
parent a9dc4ac3f0
commit 903db48280
8 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Config/UISettings.cpp
View File

@ -12,4 +12,6 @@ const ConfigInfo<bool> MAIN_USE_DISCORD_PRESENCE{{System::Main, "General", "UseD
true};
const ConfigInfo<bool> MAIN_USE_GAME_COVERS{{System::Main, "General", "UseGameCovers"}, false};
const ConfigInfo<bool> MAIN_FOCUSED_HOTKEYS{{System::Main, "General", "HotkeysRequireFocus"}, true};
} // namespace Config

1
Source/Core/Core/Config/UISettings.h
View File

@ -18,5 +18,6 @@ namespace Config
extern const ConfigInfo<bool> MAIN_USE_DISCORD_PRESENCE;
extern const ConfigInfo<bool> MAIN_USE_GAME_COVERS;
extern const ConfigInfo<bool> MAIN_FOCUSED_HOTKEYS;
} // namespace Config

7
Source/Core/Core/Core.cpp
View File

@ -1050,11 +1050,10 @@ void DoFrameStep()
}
}
void UpdateInputGate()
void UpdateInputGate(bool require_focus)
{
ControlReference::SetInputGate(
(SConfig::GetInstance().m_BackgroundInput || Host_RendererHasFocus()) &&
!Host_UIBlocksControllerState());
ControlReference::SetInputGate((!require_focus || Host_RendererHasFocus()) &&
!Host_UIBlocksControllerState());
}
} // namespace Core

2
Source/Core/Core/Core.h
View File

@ -112,6 +112,6 @@ void HostDispatchJobs();
void DoFrameStep();
void UpdateInputGate();
void UpdateInputGate(bool require_focus);
} // namespace Core

2
Source/Core/Core/HW/VideoInterface.cpp
View File

@ -826,7 +826,7 @@ void Update(u64 ticks)
if (s_half_line_of_next_si_poll == s_half_line_count)
{
Core::UpdateInputGate();
Core::UpdateInputGate(!SConfig::GetInstance().m_BackgroundInput);
SerialInterface::UpdateDevices();
s_half_line_of_next_si_poll += 2 * SerialInterface::GetPollXLines();
}