dahjah/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2026-07-11 02:14:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

combo_buttons --> combo_button_buttons

Browse Source
This commit is contained in:
OpenSauce04 2026-07-04 13:53:23 +01:00
parent 92ebdb72af
commit 64ab351d22
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeModules/GenerateSettingKeys.cmake
View File

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

2
src/android/app/src/main/java/org/citra/citra_emu/features/settings/SettingKeys.kt
View File

@ -143,5 +143,5 @@ object SettingKeys {
external fun screen_orientation(): String
external fun performance_overlay_position(): String
external fun enable_secondary_display(): String
external fun combo_buttons(): String
external fun combo_button_buttons(): String
}

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

@ -23,8 +23,8 @@ enum class IntListSetting(
/**
* Combo Buttons will be given options on MultiChoice setting initialization. This just makes selections empty by default.
*/
COMBO_BUTTONS(
SettingKeys.combo_buttons(),
COMBO_BUTTON_BUTTONS(
SettingKeys.combo_button_buttons(),
Settings.SECTION_CONTROLS,
listOf(),
canBeEmpty = true

6
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt
View File

@ -876,13 +876,13 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
add(
MultiChoiceSetting(
IntListSetting.COMBO_BUTTONS,
IntListSetting.COMBO_BUTTON_BUTTONS,
R.string.combo_button_options,
R.string.combo_button_description,
R.array.comboOptions,
R.array.comboOptionValues,
IntListSetting.COMBO_BUTTONS.key,
IntListSetting.COMBO_BUTTONS.defaultValue
IntListSetting.COMBO_BUTTON_BUTTONS.key,
IntListSetting.COMBO_BUTTON_BUTTONS.defaultValue
)
)
}

2
src/android/app/src/main/java/org/citra/citra_emu/utils/ComboHelper.kt
View File

@ -9,7 +9,7 @@ import org.citra.citra_emu.features.settings.model.IntListSetting
object ComboHelper {
fun comboActivate(buttonStatus: Int) {
val comboArray = IntListSetting.COMBO_BUTTONS.list
val comboArray = IntListSetting.COMBO_BUTTON_BUTTONS.list
for (nativeButton in comboArray) {
if (nativeButton == -1) {
// We don't want to parse any bad inputs here so we continue loop

2
src/android/app/src/main/jni/default_ini.h
View File

@ -81,7 +81,7 @@ static const char* android_config_default_file_content = (BOOST_HANA_STRING(R"(
)") DECLARE_KEY(use_artic_base_controller) BOOST_HANA_STRING(R"(
# Listing of Combo Buttons attached to the Hotkey. (Default [] or empty)
)") DECLARE_KEY(combo_buttons) BOOST_HANA_STRING(R"(
)") DECLARE_KEY(combo_button_buttons) BOOST_HANA_STRING(R"(
[Core]
# Whether to use the Just-In-Time (JIT) compiler for CPU emulation