diff --git a/es-core/src/HelpStyle.cpp b/es-core/src/HelpStyle.cpp index 5c0f069f1..3d979a48f 100644 --- a/es-core/src/HelpStyle.cpp +++ b/es-core/src/HelpStyle.cpp @@ -89,6 +89,10 @@ void HelpStyle::applyTheme(const std::shared_ptr& theme, const std::s mCustomButtons.button_r = elem->get("button_r"); if (elem->has("button_lr")) mCustomButtons.button_lr = elem->get("button_lr"); + if (elem->has("button_lt")) + mCustomButtons.button_lt = elem->get("button_lt"); + if (elem->has("button_rt")) + mCustomButtons.button_rt = elem->get("button_rt"); // SNES. if (elem->has("button_a_SNES")) diff --git a/es-core/src/HelpStyle.h b/es-core/src/HelpStyle.h index 737123ad0..0eee99dbb 100644 --- a/es-core/src/HelpStyle.h +++ b/es-core/src/HelpStyle.h @@ -40,6 +40,8 @@ struct HelpStyle { std::string button_l; std::string button_r; std::string button_lr; + std::string button_lt; + std::string button_rt; // SNES. std::string button_a_SNES; diff --git a/es-core/src/Window.cpp b/es-core/src/Window.cpp index 8b021ed9b..cea7e1066 100644 --- a/es-core/src/Window.cpp +++ b/es-core/src/Window.cpp @@ -657,8 +657,10 @@ void Window::setHelpPrompts(const std::vector& prompts, const HelpSt "b", "x", "y", - "l", "r", + "l", + "rt", + "lt", "start", "back"}; int i = 0; diff --git a/es-core/src/components/HelpComponent.cpp b/es-core/src/components/HelpComponent.cpp index 4a6bfb28b..69c1ae32c 100644 --- a/es-core/src/components/HelpComponent.cpp +++ b/es-core/src/components/HelpComponent.cpp @@ -51,6 +51,10 @@ void HelpComponent::assignIcons() mStyle.mCustomButtons.button_r; sIconPathMap["lr"] = mStyle.mCustomButtons.button_lr.empty() ? ":/help/button_lr.svg" : mStyle.mCustomButtons.button_lr; + sIconPathMap["lt"] = mStyle.mCustomButtons.button_lt.empty() ? ":/help/button_lt.svg" : + mStyle.mCustomButtons.button_lt; + sIconPathMap["rt"] = mStyle.mCustomButtons.button_rt.empty() ? ":/help/button_rt.svg" : + mStyle.mCustomButtons.button_rt; // These graphics files are custom per controller type. if (controllerType == "snes") {