ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12375 from JosJuice/android-gate-size-crash 

Android: Fix crash when trying to edit gate size setting
This commit is contained in:
JosJuice 2024-01-07 19:34:06 +01:00 committed by GitHub
parent 696a6defd2 ab4f4c62ee
commit 4e57b66dcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FloatSliderSetting.kt
View File

@ -56,9 +56,6 @@ open class FloatSliderSetting : SliderSetting {
get() = floatSetting.float get() = floatSetting.float
open fun setSelectedValue(settings: Settings, selection: Float) { open fun setSelectedValue(settings: Settings, selection: Float) {
floatSetting.setFloat( floatSetting.setFloat(settings, selection)
settings,
BigDecimal((selection).toDouble()).round(MathContext(3)).toFloat()
)
} }
} }

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

@ -41,6 +41,7 @@ import java.io.File
import java.io.IOException import java.io.IOException
import java.io.RandomAccessFile import java.io.RandomAccessFile
import java.util.* import java.util.*
import kotlin.math.roundToInt
class SettingsAdapter( class SettingsAdapter(
private val fragmentView: SettingsFragmentView, private val fragmentView: SettingsFragmentView,
@ -259,7 +260,7 @@ class SettingsAdapter(
slider.stepSize = item.stepSize.toFloat() slider.stepSize = item.stepSize.toFloat()
} }
} }
slider.value = seekbarProgress slider.value = (seekbarProgress / slider.stepSize).roundToInt() * slider.stepSize
slider.addOnChangeListener(this) slider.addOnChangeListener(this)
dialog = MaterialAlertDialogBuilder(fragmentView.fragmentActivity) dialog = MaterialAlertDialogBuilder(fragmentView.fragmentActivity)