From 9e0a6df760496b7fc99abff2dbe40937b17e0007 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Wed, 7 Dec 2022 17:34:07 +0100 Subject: [PATCH] Added support for a left/right trigger help system button. --- es-core/src/HelpStyle.cpp | 2 ++ es-core/src/HelpStyle.h | 1 + es-core/src/components/HelpComponent.cpp | 3 +++ 3 files changed, 6 insertions(+) diff --git a/es-core/src/HelpStyle.cpp b/es-core/src/HelpStyle.cpp index 137c9a797..95d8de433 100644 --- a/es-core/src/HelpStyle.cpp +++ b/es-core/src/HelpStyle.cpp @@ -100,6 +100,8 @@ void HelpStyle::applyTheme(const std::shared_ptr& theme, const std::s mCustomButtons.button_lt = elem->get(PREFIX "button_lt"); if (elem->has(PREFIX "button_rt")) mCustomButtons.button_rt = elem->get(PREFIX "button_rt"); + if (elem->has(PREFIX "button_ltrt")) + mCustomButtons.button_ltrt = elem->get(PREFIX "button_ltrt"); // SNES. if (elem->has(PREFIX "button_a_SNES")) diff --git a/es-core/src/HelpStyle.h b/es-core/src/HelpStyle.h index 86ada3fa8..6ebd49d32 100644 --- a/es-core/src/HelpStyle.h +++ b/es-core/src/HelpStyle.h @@ -42,6 +42,7 @@ struct HelpStyle { std::string button_lr; std::string button_lt; std::string button_rt; + std::string button_ltrt; // SNES std::string button_a_SNES; diff --git a/es-core/src/components/HelpComponent.cpp b/es-core/src/components/HelpComponent.cpp index 391be51c9..b33a3df79 100644 --- a/es-core/src/components/HelpComponent.cpp +++ b/es-core/src/components/HelpComponent.cpp @@ -56,6 +56,9 @@ void HelpComponent::assignIcons() mStyle.mCustomButtons.button_lt; sIconPathMap["rt"] = mStyle.mCustomButtons.button_rt.empty() ? ":/graphics/help/button_rt.svg" : mStyle.mCustomButtons.button_rt; + sIconPathMap["ltrt"] = mStyle.mCustomButtons.button_ltrt.empty() ? + ":/graphics/help/button_ltrt.svg" : + mStyle.mCustomButtons.button_ltrt; // These graphics files are custom per controller type. if (controllerType == "snes") {