github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-06 03:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

FullscreenUI: Fix hotkey categories duplicating

Browse Source
This commit is contained in:
Stenzek 2025-03-30 14:59:38 +10:00
parent 64513395f3
commit c5cc94c4b7
No known key found for this signature in database
1 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/core/fullscreen_ui.cpp
View File

@ -296,6 +296,7 @@ static void DoSetCoverImage(std::string source_path, std::string existing_path,
// Settings // Settings
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
static void InitializeHotkeyList();
static void SwitchToSettings(); static void SwitchToSettings();
static bool SwitchToGameSettings(); static bool SwitchToGameSettings();
static void SwitchToGameSettings(const GameList::Entry* entry); static void SwitchToGameSettings(const GameList::Entry* entry);
@ -744,12 +745,10 @@ bool FullscreenUI::Initialize()
} }
s_state.initialized = true; s_state.initialized = true;
s_state.hotkey_list_cache = InputManager::GetHotkeyList();
const bool open_main_window = (s_state.current_main_window == MainWindowType::None && !GPUThread::HasGPUBackend() &&
!GPUThread::IsGPUBackendRequested());
// in case we open the pause menu while the game is running // in case we open the pause menu while the game is running
const bool open_main_window = (s_state.current_main_window == MainWindowType::None && !GPUThread::HasGPUBackend() &&
!GPUThread::IsGPUBackendRequested());
if (GPUThread::HasGPUBackend()) if (GPUThread::HasGPUBackend())
{ {
Host::RunOnCPUThread([]() { Host::RunOnCPUThread([]() {
@ -1381,6 +1380,8 @@ bool FullscreenUI::LoadResources()
if (!CompileTransitionPipelines()) if (!CompileTransitionPipelines())
return false; return false;
InitializeHotkeyList();
return true; return true;
} }
@ -3615,6 +3616,39 @@ void FullscreenUI::StartClearBindingsForPort(u32 port)
}); });
} }
void FullscreenUI::InitializeHotkeyList()
{
// sort hotkeys by category so we don't duplicate the groups
const auto hotkeys = InputManager::GetHotkeyList();
s_state.hotkey_list_cache.reserve(hotkeys.size());
// this mess is needed to preserve the category order
for (size_t i = 0; i < hotkeys.size(); i++)
{
const HotkeyInfo* hk = hotkeys[i];
size_t j;
for (j = 0; j < s_state.hotkey_list_cache.size(); j++)
{
if (std::strcmp(hk->category, s_state.hotkey_list_cache[j]->category) == 0)
break;
}
if (j != s_state.hotkey_list_cache.size())
{
// already done
continue;
}
// add all hotkeys with this category
for (const HotkeyInfo* other_hk : hotkeys)
{
if (std::strcmp(hk->category, other_hk->category) != 0)
continue;
s_state.hotkey_list_cache.push_back(other_hk);
}
}
}
void FullscreenUI::SwitchToSettings() void FullscreenUI::SwitchToSettings()
{ {
s_state.game_settings_entry.reset(); s_state.game_settings_entry.reset();