piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-28 01:49:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Android: Don't dismiss AdvancedMappingDialog when pressing Clear

Browse Source 
If you already have a mapping set in the advanced mapping dialog and
want to change it, the easiest way to do it is to press Clear and then
select the new mapping from the list. But pressing Clear causes the
dialog to close, forcing you to open it again, which is inconvenient.
This commit makes it so the Clear button doesn't close the dialog.
This commit is contained in:
JosJuice
2025-05-12 21:31:24 +02:00
parent 63572f15fc
commit eeae30e2bb
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/ui/AdvancedMappingDialog.kt
View File

@ -52,8 +52,9 @@ class AdvancedMappingDialog(
selectDefaultDevice() selectDefaultDevice()
} }
val expression: String var expression: String
get() = binding.editExpression.text.toString() get() = binding.editExpression.text.toString()
set(value) = binding.editExpression.setText(value)
override fun onItemClick(adapterView: AdapterView<*>?, view: View, position: Int, id: Long) = override fun onItemClick(adapterView: AdapterView<*>?, view: View, position: Int, id: Long) =
setSelectedDevice(devices[position]) setSelectedDevice(devices[position])

12
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.kt
View File

@ -347,13 +347,15 @@ class SettingsAdapter(
dialog.setButton( dialog.setButton(
AlertDialog.BUTTON_NEUTRAL, AlertDialog.BUTTON_NEUTRAL,
context.getString(R.string.clear) context.getString(R.string.clear)
) { _: DialogInterface?, _: Int -> ) { _: DialogInterface?, _: Int -> }
item.clearValue()
notifyItemChanged(position)
fragmentView.onSettingChanged()
}
dialog.setCanceledOnTouchOutside(false) dialog.setCanceledOnTouchOutside(false)
dialog.show() dialog.show()
// We're setting this OnClickListener late so that pressing the Clear button won't result
// in the dialog closing
dialog.getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener {
dialog.expression = ""
}
} }
fun onFilePickerDirectoryClick(item: SettingsItem, position: Int) { fun onFilePickerDirectoryClick(item: SettingsItem, position: Int) {