dahjah/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2026-06-08 09:05:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Displayed combo button in both landscape and portrait

Browse Source
This commit is contained in:
adas20 2025-07-28 13:43:33 -04:00
parent 5d6c9cb6bf
commit 1fb2013090
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt
View File

@ -542,6 +542,18 @@ class InputOverlay(context: Context?, attrs: AttributeSet?) : SurfaceView(contex
) )
) )
} }
if (preferences.getBoolean("buttonToggle16", true)) {
overlayButtons.add(
initializeOverlayButton(
context,
R.drawable.button_combo,
R.drawable.button_combo_pressed,
NativeLibrary.ButtonType.BUTTON_COMBO,
orientation
)
)
}
} }
fun refreshControls() { fun refreshControls() {
@ -755,6 +767,14 @@ class InputOverlay(context: Context?, attrs: AttributeSet?) : SurfaceView(contex
NativeLibrary.ButtonType.BUTTON_TURBO.toString() + "-Y", NativeLibrary.ButtonType.BUTTON_TURBO.toString() + "-Y",
resources.getInteger(R.integer.N3DS_BUTTON_TURBO_Y).toFloat() / 1000 * maxY resources.getInteger(R.integer.N3DS_BUTTON_TURBO_Y).toFloat() / 1000 * maxY
) )
.putFloat(
NativeLibrary.ButtonType.BUTTON_COMBO.toString() + "-X",
resources.getInteger(R.integer.N3DS_BUTTON_COMBO_X).toFloat() / 1000 * maxX
)
.putFloat(
NativeLibrary.ButtonType.BUTTON_COMBO.toString() + "-Y",
resources.getInteger(R.integer.N3DS_BUTTON_COMBO_Y).toFloat() / 1000 * maxY
)
.apply() .apply()
} }
@ -906,6 +926,14 @@ class InputOverlay(context: Context?, attrs: AttributeSet?) : SurfaceView(contex
NativeLibrary.ButtonType.BUTTON_TURBO.toString() + portrait + "-Y", NativeLibrary.ButtonType.BUTTON_TURBO.toString() + portrait + "-Y",
resources.getInteger(R.integer.N3DS_BUTTON_TURBO_PORTRAIT_Y).toFloat() / 1000 * maxY resources.getInteger(R.integer.N3DS_BUTTON_TURBO_PORTRAIT_Y).toFloat() / 1000 * maxY
) )
.putFloat(
NativeLibrary.ButtonType.BUTTON_COMBO.toString() + portrait + "-X",
resources.getInteger(R.integer.N3DS_BUTTON_COMBO_X).toFloat() / 1000 * maxX
)
.putFloat(
NativeLibrary.ButtonType.BUTTON_COMBO.toString() + portrait + "-Y",
resources.getInteger(R.integer.N3DS_BUTTON_COMBO_Y).toFloat() / 1000 * maxY
)
.apply() .apply()
} }

8
src/android/app/src/main/res/values/integers.xml
View File

@ -35,8 +35,8 @@
<integer name="N3DS_BUTTON_SWAP_Y">850</integer> <integer name="N3DS_BUTTON_SWAP_Y">850</integer>
<integer name="N3DS_BUTTON_TURBO_X">630</integer> <integer name="N3DS_BUTTON_TURBO_X">630</integer>
<integer name="N3DS_BUTTON_TURBO_Y">850</integer> <integer name="N3DS_BUTTON_TURBO_Y">850</integer>
<integer name="N3DS_BUTTON_COMBO_X">900</integer> <integer name="N3DS_BUTTON_COMBO_X">750</integer>
<integer name="N3DS_BUTTON_COMBO_Y">900</integer> <integer name="N3DS_BUTTON_COMBO_Y">800</integer>
<!-- Default N3DS portrait layout --> <!-- Default N3DS portrait layout -->
<integer name="N3DS_BUTTON_A_PORTRAIT_X">810</integer> <integer name="N3DS_BUTTON_A_PORTRAIT_X">810</integer>
@ -71,7 +71,7 @@
<integer name="N3DS_BUTTON_SWAP_PORTRAIT_Y">675</integer> <integer name="N3DS_BUTTON_SWAP_PORTRAIT_Y">675</integer>
<integer name="N3DS_BUTTON_TURBO_PORTRAIT_X">453</integer> <integer name="N3DS_BUTTON_TURBO_PORTRAIT_X">453</integer>
<integer name="N3DS_BUTTON_TURBO_PORTRAIT_Y">720</integer> <integer name="N3DS_BUTTON_TURBO_PORTRAIT_Y">720</integer>
<integer name="N3DS_BUTTON_COMBO_PORTRAIT_X">900</integer> <integer name="N3DS_BUTTON_COMBO_PORTRAIT_X">460</integer>
<integer name="N3DS_BUTTON_COMBO_PORTRAIT_Y">1600</integer> <integer name="N3DS_BUTTON_COMBO_PORTRAIT_Y">550</integer>
</resources> </resources>