From 5339a46ba27c1ff3051d944b9d33b88df3d9cec9 Mon Sep 17 00:00:00 2001
From: adas20 <dasar-24@rhodes.edu>
Date: Mon, 4 Aug 2025 15:10:38 -0400
Subject: [PATCH] Made ComboHelper code more readable and added the key setting
 to be toggleable in game

---
 .../citra/citra_emu/fragments/EmulationFragment.kt   |  9 +++++++--
 .../java/org/citra/citra_emu/overlay/InputOverlay.kt |  2 +-
 .../java/org/citra/citra_emu/utils/ComboHelper.kt    | 12 ++++++------
 .../app/src/main/res/menu/menu_overlay_options.xml   |  3 +++
 src/android/app/src/main/res/values/arrays.xml       |  1 +
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt
index fbf3e5525..55646f035 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt
@@ -785,6 +785,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                     true
                 }
 
+                R.id.menu_emulation_adjust_scale_button_combo -> {
+                    showAdjustScaleDialog("controlScale-" + NativeLibrary.ButtonType.BUTTON_COMBO)
+                    true
+                }
+
                 R.id.menu_emulation_adjust_opacity -> {
                     showAdjustOpacityDialog()
                     true
@@ -1002,12 +1007,12 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
 
     private fun showToggleControlsDialog() {
         val editor = preferences.edit()
-        val enabledButtons = BooleanArray(16)
+        val enabledButtons = BooleanArray(17)
         enabledButtons.forEachIndexed { i: Int, _: Boolean ->
             // Buttons that are disabled by default
             var defaultValue = true
             when (i) {
-                6, 7, 12, 13, 14, 15 -> defaultValue = false
+                6, 7, 12, 13, 14, 15, 16 -> defaultValue = false
             }
             enabledButtons[i] = preferences.getBoolean("buttonToggle$i", defaultValue)
         }
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt b/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt
index 1199f112b..4f5fddf96 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt
@@ -548,7 +548,7 @@ class InputOverlay(context: Context?, attrs: AttributeSet?) : SurfaceView(contex
             )
         }
 
-        if (preferences.getBoolean("buttonToggle16", true)) {
+        if (preferences.getBoolean("buttonToggle16", false)) {
             overlayButtons.add(
                 initializeOverlayButton(
                     context,
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt b/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt
index 77746d140..80fbf97af 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt
+++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt
@@ -4,10 +4,7 @@
 
 package org.citra.citra_emu.utils
 
-import org.citra.citra_emu.CitraApplication
 import org.citra.citra_emu.NativeLibrary
-import org.citra.citra_emu.R
-import org.citra.citra_emu.features.settings.model.BooleanSetting
 import org.citra.citra_emu.features.settings.model.Settings
 import org.citra.citra_emu.overlay.InputOverlayDrawableButton
 
@@ -33,10 +30,13 @@ object ComboHelper {
         var comboArray = Settings.comboSelection
         for (selectedbutton in comboArray) {
             var nativebutton = getButton(selectedbutton)
-            if (nativebutton == -1) {
+            if (nativebutton == -1)
+            {
                 println("Bad Button")
-            } else {
-            NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, nativebutton, button.status)
+            }
+            else
+            {
+                NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, nativebutton, button.status)
             }
         }
     }
diff --git a/src/android/app/src/main/res/menu/menu_overlay_options.xml b/src/android/app/src/main/res/menu/menu_overlay_options.xml
index 8bb19ee26..34589ebc3 100644
--- a/src/android/app/src/main/res/menu/menu_overlay_options.xml
+++ b/src/android/app/src/main/res/menu/menu_overlay_options.xml
@@ -79,6 +79,9 @@
             <item
                 android:id="@+id/menu_emulation_adjust_scale_button_swap"
                 android:title="@string/button_swap" />
+            <item
+                android:id="@+id/menu_emulation_adjust_scale_button_combo"
+                android:title="@string/button_combo" />
         </menu>
     </item>
 
diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml
index 543b59913..92e549620 100644
--- a/src/android/app/src/main/res/values/arrays.xml
+++ b/src/android/app/src/main/res/values/arrays.xml
@@ -167,6 +167,7 @@
         <item>@string/button_home</item>
         <item>@string/button_swap</item>
         <item>@string/button_turbo</item>
+        <item>@string/button_combo</item>
     </string-array>
 
     <string-array name="cameraImageSourceNames">