From 1d7c8d64375464ff8a6af9d825e091b2d7e72008 Mon Sep 17 00:00:00 2001
From: ADAS2024 <dasar-24@rhodes.edu>
Date: Wed, 27 May 2026 01:10:29 -0400
Subject: [PATCH] Trying to integrate combo button as a SettingsKey setting.
 Running into issues with malformed/missing key

---
 CMakeModules/GenerateSettingKeys.cmake                          | 1 +
 .../java/org/citra/citra_emu/features/settings/SettingKeys.kt   | 1 +
 .../citra/citra_emu/features/settings/model/IntListSetting.kt   | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeModules/GenerateSettingKeys.cmake b/CMakeModules/GenerateSettingKeys.cmake
index 7aff65db5..14b7d5072 100644
--- a/CMakeModules/GenerateSettingKeys.cmake
+++ b/CMakeModules/GenerateSettingKeys.cmake
@@ -238,6 +238,7 @@ if (ANDROID)
         "android_hide_images"
         "screen_orientation"
         "performance_overlay_position"
+        "combo_buttons"
     )
         string(REPLACE "_" "_1" KEY_JNI_ESCAPED ${KEY})
         set(SETTING_KEY_LIST "${SETTING_KEY_LIST}\n\"${KEY}\",")
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/SettingKeys.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/SettingKeys.kt
index 56ffb6789..0a5b05960 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/SettingKeys.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/SettingKeys.kt
@@ -141,4 +141,5 @@ object SettingKeys {
     external fun android_hide_images(): String
     external fun screen_orientation(): String
     external fun performance_overlay_position(): String
+    external fun combo_buttons(): String
 }
\ No newline at end of file
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntListSetting.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntListSetting.kt
index 96b75ce90..8bfeb4df6 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntListSetting.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntListSetting.kt
@@ -16,7 +16,7 @@ enum class IntListSetting(
 ) : AbstractListSetting<Int> {
 
     LAYOUTS_TO_CYCLE(SettingKeys.layouts_to_cycle(), Settings.SECTION_LAYOUT, listOf(0, 1, 2, 3, 4, 5), canBeEmpty = false),
-    COMBO_BUTTONS("combo_buttons", Settings.SECTION_CONTROLS,
+    COMBO_BUTTONS(SettingKeys.combo_buttons(), Settings.SECTION_CONTROLS,
         CitraApplication.appContext.resources.getIntArray(R.array.comboOptionValues).toCollection(ArrayList()),
         canBeEmpty = true);