MirrorRepos/azahar
1
0
Fork 0
mirror of https://github.com/azahar-emu/azahar.git synced 2026-06-06 02:33:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Trying to integrate combo button as a SettingsKey setting. Running into issues with malformed/missing key

Browse source
This commit is contained in:
ADAS2024 2026-05-27 01:10:29 -04:00
parent 36f458552c
commit 1d7c8d6437
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeModules/GenerateSettingKeys.cmake
View file

@ -238,6 +238,7 @@ if (ANDROID)
"android_hide_images" "android_hide_images"
"screen_orientation" "screen_orientation"
"performance_overlay_position" "performance_overlay_position"
"combo_buttons"
) )
string(REPLACE "_" "_1" KEY_JNI_ESCAPED ${KEY}) string(REPLACE "_" "_1" KEY_JNI_ESCAPED ${KEY})
set(SETTING_KEY_LIST "${SETTING_KEY_LIST}\n\"${KEY}\",") set(SETTING_KEY_LIST "${SETTING_KEY_LIST}\n\"${KEY}\",")

1
src/android/app/src/main/java/org/citra/citra_emu/features/settings/SettingKeys.kt
View file

@ -141,4 +141,5 @@ object SettingKeys {
external fun android_hide_images(): String external fun android_hide_images(): String
external fun screen_orientation(): String external fun screen_orientation(): String
external fun performance_overlay_position(): String external fun performance_overlay_position(): String
external fun combo_buttons(): String
} }

2
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntListSetting.kt
View file

@ -16,7 +16,7 @@ enum class IntListSetting(
) : AbstractListSetting<Int> { ) : AbstractListSetting<Int> {
LAYOUTS_TO_CYCLE(SettingKeys.layouts_to_cycle(), Settings.SECTION_LAYOUT, listOf(0, 1, 2, 3, 4, 5), canBeEmpty = false), 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()), CitraApplication.appContext.resources.getIntArray(R.array.comboOptionValues).toCollection(ArrayList()),
canBeEmpty = true); canBeEmpty = true);