From 82fdfe7706e9c94db014e9b0070afea7a276de18 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Mon, 3 Feb 2025 19:48:20 +0100 Subject: [PATCH] Added 'thumbstickclick' as a supported 'entries' property value for the helpsystem element --- es-core/src/Window.cpp | 5 +++-- es-core/src/components/HelpComponent.h | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/es-core/src/Window.cpp b/es-core/src/Window.cpp index a7a0758cd..085a34600 100644 --- a/es-core/src/Window.cpp +++ b/es-core/src/Window.cpp @@ -818,10 +818,11 @@ void Window::setHelpPrompts(const std::vector& prompts) } } - // Sort prompts so it goes [dpad_all] [dpad_u/d] [dpad_l/r] [a/b/x/y/l/r] [start/back]. + // Sort the prompts so that they are always displayed in the same order on screen. std::sort(addPrompts.begin(), addPrompts.end(), [](const HelpPrompt& a, const HelpPrompt& b) -> bool { - static const std::vector map {"up/down/left/right", + static const std::vector map {"thumbstickclick", + "up/down/left/right", "up/down", "up", "down", diff --git a/es-core/src/components/HelpComponent.h b/es-core/src/components/HelpComponent.h index aea576db4..f1def52f2 100644 --- a/es-core/src/components/HelpComponent.h +++ b/es-core/src/components/HelpComponent.h @@ -54,7 +54,8 @@ private: std::shared_ptr mStyleFontDimmed; std::vector mEntries; - static inline std::vector sAllowedEntries {"up/down/left/right", + static inline std::vector sAllowedEntries {"thumbstickclick", + "up/down/left/right", "up/down", "up", "down",