From ad9c460ec9da7adaf7851a1a5b7d115e76cf4565 Mon Sep 17 00:00:00 2001
From: SuperDude88 <82904174+SuperDude88@users.noreply.github.com>
Date: Sat, 9 May 2026 16:23:59 -0400
Subject: [PATCH] Navigate Carousel Without Focus (#741)

* Navigate Carousel Without Focus

- Allow left/right inputs to change the setting value without having the arrow explicitly clicked

* Formatting
---
 src/dusk/ui/graphics_tuner.cpp | 9 ++++++---
 src/dusk/ui/graphics_tuner.hpp | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/dusk/ui/graphics_tuner.cpp b/src/dusk/ui/graphics_tuner.cpp
index 188f0911c5..4f68d4a078 100644
--- a/src/dusk/ui/graphics_tuner.cpp
+++ b/src/dusk/ui/graphics_tuner.cpp
@@ -195,8 +195,7 @@ Rml::String format_graphics_setting_value(GraphicsOption option, int value) {
 
 GraphicsTuner::GraphicsTuner(GraphicsTunerProps props, bool prelaunch)
     : Document(kDocumentSource), mOption(props.option), mValueMin(props.valueMin),
-      mValueMax(props.valueMax), mDefaultValue(props.defaultValue), mPrelaunch(prelaunch)
-{
+      mValueMax(props.valueMax), mDefaultValue(props.defaultValue), mPrelaunch(prelaunch) {
     if (mDocument == nullptr) {
         return;
     }
@@ -208,7 +207,7 @@ GraphicsTuner::GraphicsTuner(GraphicsTunerProps props, bool prelaunch)
         description->SetInnerRML(escape(props.helpText));
     }
     if (auto* carouselParent = mDocument->GetElementById("carousel-container")) {
-        add_component<SteppedCarousel>(carouselParent,
+        mCarousel = &add_component<SteppedCarousel>(carouselParent,
             SteppedCarousel::Props{
                 .min = mValueMin,
                 .max = mValueMax,
@@ -283,6 +282,10 @@ bool GraphicsTuner::handle_nav_command(Rml::Event& event, NavCommand cmd) {
         return true;
     }
 
+    if (mCarousel && mCarousel->handle_nav_command(cmd)) {
+        return true;
+    }
+
     return mPrelaunch ? false : Document::handle_nav_command(event, cmd);
 }
 
diff --git a/src/dusk/ui/graphics_tuner.hpp b/src/dusk/ui/graphics_tuner.hpp
index b020db1128..254aada22b 100644
--- a/src/dusk/ui/graphics_tuner.hpp
+++ b/src/dusk/ui/graphics_tuner.hpp
@@ -28,9 +28,9 @@ public:
 
     bool focus() override;
     void update() override;
+    bool handle_nav_command(NavCommand cmd);
 
 private:
-    bool handle_nav_command(NavCommand cmd);
     void apply(int value);
 
     Props mProps;
@@ -86,6 +86,7 @@ private:
     int mValueMax = 0;
     int mDefaultValue = 0;
     std::vector<std::unique_ptr<Component> > mComponents;
+    SteppedCarousel* mCarousel;
     Rml::Element* mRoot;
     bool mPrelaunch;
 };