diff options
| author | JosJuice <josjuice@gmail.com> | 2024-01-07 19:34:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-07 19:34:06 +0100 |
| commit | 4e57b66dcf3cb6a9a740f639802dec442fd5dd43 (patch) | |
| tree | 5b136d41a76c974a1401216eeb7fc44fb4200c08 /Source/Android/app/src/main/java | |
| parent | 696a6defd2ad87cdcc78a400fdac6aefc7741ed8 (diff) | |
| parent | ab4f4c62ee6efd505e5d54121c7646ff07f9345a (diff) | |
Merge pull request #12375 from JosJuice/android-gate-size-crash
Android: Fix crash when trying to edit gate size setting
Diffstat (limited to 'Source/Android/app/src/main/java')
2 files changed, 3 insertions, 5 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FloatSliderSetting.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FloatSliderSetting.kt index 34d0b0eb00..8a193afc6a 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FloatSliderSetting.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FloatSliderSetting.kt @@ -56,9 +56,6 @@ open class FloatSliderSetting : SliderSetting { get() = floatSetting.float open fun setSelectedValue(settings: Settings, selection: Float) { - floatSetting.setFloat( - settings, - BigDecimal((selection).toDouble()).round(MathContext(3)).toFloat() - ) + floatSetting.setFloat(settings, selection) } } diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.kt index 0d2b8786b0..bcf68e67ec 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.kt @@ -41,6 +41,7 @@ import java.io.File import java.io.IOException import java.io.RandomAccessFile import java.util.* +import kotlin.math.roundToInt class SettingsAdapter( private val fragmentView: SettingsFragmentView, @@ -259,7 +260,7 @@ class SettingsAdapter( slider.stepSize = item.stepSize.toFloat() } } - slider.value = seekbarProgress + slider.value = (seekbarProgress / slider.stepSize).roundToInt() * slider.stepSize slider.addOnChangeListener(this) dialog = MaterialAlertDialogBuilder(fragmentView.fragmentActivity) |