From c4f065611eb8109ff0579e6a026aa5787b1510ad Mon Sep 17 00:00:00 2001 From: weihuoya Date: Tue, 13 Nov 2018 10:04:44 +0800 Subject: [PATCH] Android: fx setting --- .../settings/model/view/SliderSetting.java | 9 ++++++-- .../features/settings/ui/SettingsAdapter.java | 5 ++--- .../ui/SettingsFragmentPresenter.java | 22 ++++++++++--------- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SliderSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SliderSetting.java index ac54560ba0..f0209a7b33 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SliderSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SliderSetting.java @@ -44,8 +44,7 @@ public final class SliderSetting extends SettingsItem else if (setting instanceof FloatSetting) { FloatSetting floatSetting = (FloatSetting) setting; - if (floatSetting.getKey().equals(SettingsFile.KEY_OVERCLOCK_PERCENT) - || floatSetting.getKey().equals(SettingsFile.KEY_SPEED_LIMIT)) + if (isPercentSetting()) { return Math.round(floatSetting.getValue() * 100); } @@ -61,6 +60,12 @@ public final class SliderSetting extends SettingsItem } } + public boolean isPercentSetting() + { + return getKey().equals(SettingsFile.KEY_OVERCLOCK_PERCENT) + || getKey().equals(SettingsFile.KEY_SPEED_LIMIT); + } + /** * Write a value to the backing int. If that int was previously null, * initializes a new one and returns it, so it can be added to the Hashmap. diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java index cbf53060eb..595aae8264 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java @@ -309,12 +309,11 @@ public final class SettingsAdapter extends RecyclerView.Adapter