mirror of
https://github.com/azahar-emu/azahar.git
synced 2026-06-05 18:23:39 -04:00
Merge branch 'master' into COMBO_BUTTON
This commit is contained in:
commit
f1d9851786
1 changed files with 3 additions and 2 deletions
|
|
@ -6,6 +6,7 @@ package org.citra.citra_emu.features.settings.model
|
|||
|
||||
import org.citra.citra_emu.CitraApplication
|
||||
import org.citra.citra_emu.R
|
||||
import org.citra.citra_emu.features.settings.SettingKeys
|
||||
|
||||
enum class IntListSetting(
|
||||
override val key: String,
|
||||
|
|
@ -14,11 +15,11 @@ enum class IntListSetting(
|
|||
val canBeEmpty: Boolean = true
|
||||
) : AbstractListSetting<Int> {
|
||||
|
||||
LAYOUTS_TO_CYCLE("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_KEYS("combo_keys", Settings.SECTION_CONTROLS,
|
||||
CitraApplication.appContext.resources.getIntArray(R.array.comboOptionValues).toCollection(ArrayList()),
|
||||
canBeEmpty = true);
|
||||
|
||||
|
||||
private var backingList: List<Int> = defaultValue
|
||||
private var lastValidList : List<Int> = defaultValue
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue