From 28d3c0768a05959d3162ee562cbc0e2add24ed46 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sat, 14 Aug 2021 23:41:02 +1000 Subject: [PATCH] NoGUI: Move default quick menu bind out of CommonHostInterface --- src/duckstation-nogui/nogui_host_interface.cpp | 8 ++++++++ src/duckstation-nogui/nogui_host_interface.h | 2 ++ src/frontend-common/common_host_interface.cpp | 4 ---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/duckstation-nogui/nogui_host_interface.cpp b/src/duckstation-nogui/nogui_host_interface.cpp index c1f480ef8..638af4eaa 100644 --- a/src/duckstation-nogui/nogui_host_interface.cpp +++ b/src/duckstation-nogui/nogui_host_interface.cpp @@ -81,6 +81,14 @@ void NoGUIHostInterface::Shutdown() CommonHostInterface::Shutdown(); } +void NoGUIHostInterface::SetDefaultSettings(SettingsInterface& si) +{ + CommonHostInterface::SetDefaultSettings(si); + + // TODO: Maybe we should bind this to F1 in the future. + si.SetStringValue("Hotkeys", "OpenQuickMenu", "Keyboard/Escape"); +} + bool NoGUIHostInterface::CreateDisplay(bool fullscreen) { std::optional wi = GetPlatformWindowInfo(); diff --git a/src/duckstation-nogui/nogui_host_interface.h b/src/duckstation-nogui/nogui_host_interface.h index bcfb5a3ad..cfda03ff2 100644 --- a/src/duckstation-nogui/nogui_host_interface.h +++ b/src/duckstation-nogui/nogui_host_interface.h @@ -43,6 +43,8 @@ protected: void RequestExit() override; + virtual void SetDefaultSettings(SettingsInterface& si) override; + virtual bool CreatePlatformWindow() = 0; virtual void DestroyPlatformWindow() = 0; virtual std::optional GetPlatformWindowInfo() = 0; diff --git a/src/frontend-common/common_host_interface.cpp b/src/frontend-common/common_host_interface.cpp index 60ac41067..27764d83c 100644 --- a/src/frontend-common/common_host_interface.cpp +++ b/src/frontend-common/common_host_interface.cpp @@ -3037,10 +3037,6 @@ void CommonHostInterface::SetDefaultSettings(SettingsInterface& si) { HostInterface::SetDefaultSettings(si); - // TODO: Maybe we should bind this to F1 in the future. - if (m_fullscreen_ui_enabled) - si.SetStringValue("Hotkeys", "OpenQuickMenu", "Keyboard/Escape"); - si.SetStringValue("Controller1", "ButtonUp", "Keyboard/W"); si.SetStringValue("Controller1", "ButtonDown", "Keyboard/S"); si.SetStringValue("Controller1", "ButtonLeft", "Keyboard/A");