diff --git a/src/android/app/src/main/java/org/citra/citra_android/model/settings/view/SliderSetting.java b/src/android/app/src/main/java/org/citra/citra_android/model/settings/view/SliderSetting.java index 2fa38f41d..6cc0efdef 100644 --- a/src/android/app/src/main/java/org/citra/citra_android/model/settings/view/SliderSetting.java +++ b/src/android/app/src/main/java/org/citra/citra_android/model/settings/view/SliderSetting.java @@ -7,19 +7,25 @@ import org.citra.citra_android.utils.Log; import org.citra.citra_android.utils.SettingsFile; public final class SliderSetting extends SettingsItem { + private int mMin; private int mMax; private int mDefaultValue; private String mUnits; public SliderSetting(String key, String section, int file, int titleId, int descriptionId, - int max, String units, int defaultValue, Setting setting) { + int min, int max, String units, int defaultValue, Setting setting) { super(key, section, file, setting, titleId, descriptionId); + mMin = min; mMax = max; mUnits = units; mDefaultValue = defaultValue; } + public int getMin() { + return mMin; + } + public int getMax() { return mMax; } diff --git a/src/android/app/src/main/java/org/citra/citra_android/ui/settings/SettingsAdapter.java b/src/android/app/src/main/java/org/citra/citra_android/ui/settings/SettingsAdapter.java index 1b1ed67c8..275d2ba67 100644 --- a/src/android/app/src/main/java/org/citra/citra_android/ui/settings/SettingsAdapter.java +++ b/src/android/app/src/main/java/org/citra/citra_android/ui/settings/SettingsAdapter.java @@ -237,6 +237,7 @@ public final class SettingsAdapter extends RecyclerView.Adapter sl) { @@ -262,7 +262,7 @@ public final class SettingsFragmentPresenter { sl.add(new CheckBoxSetting(SettingsFile.KEY_HW_RENDERER, SettingsFile.SECTION_RENDERER, SettingsFile.SETTINGS_DOLPHIN, R.string.hw_renderer, R.string.hw_renderer_description, true, hardwareRenderer, true, mView)); sl.add(new CheckBoxSetting(SettingsFile.KEY_HW_SHADER, SettingsFile.SECTION_RENDERER, SettingsFile.SETTINGS_DOLPHIN, R.string.hw_shaders, R.string.hw_shaders_description, true, hardwareShader, true, mView)); sl.add(new CheckBoxSetting(SettingsFile.KEY_SHADERS_ACCURATE_MUL, SettingsFile.SECTION_RENDERER, SettingsFile.SETTINGS_DOLPHIN, R.string.shaders_accurate_mul, R.string.shaders_accurate_mul_description, true, shadersAccurateMul)); - sl.add(new SliderSetting(SettingsFile.KEY_RESOLUTION_FACTOR, SettingsFile.SECTION_RENDERER, SettingsFile.SETTINGS_DOLPHIN, R.string.internal_resolution, R.string.internal_resolution_description, 10, "x", 1, resolutionFactor)); + sl.add(new SliderSetting(SettingsFile.KEY_RESOLUTION_FACTOR, SettingsFile.SECTION_RENDERER, SettingsFile.SETTINGS_DOLPHIN, R.string.internal_resolution, R.string.internal_resolution_description, 1, 4, "x", 1, resolutionFactor)); sl.add(new CheckBoxSetting(SettingsFile.KEY_USE_VSYNC, SettingsFile.SECTION_RENDERER, SettingsFile.SETTINGS_DOLPHIN, R.string.vsync, R.string.vsync_description, false, vsyncEnable)); sl.add(new CheckBoxSetting(SettingsFile.KEY_FILTER_MODE, SettingsFile.SECTION_RENDERER, SettingsFile.SETTINGS_DOLPHIN, R.string.linear_filtering, R.string.linear_filtering_description, true, filterMode)); } diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index 6782d9015..660dba1ba 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -70,7 +70,7 @@ Limit speed percent Specifies the percentage to limit emulation speed. With the default of 100% emulation will be limited to normal speed. Values higher or lower will increase or decrease the speed limit. Internal resolution - Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games. Use zero(0) for auto scaling. + Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games. Enable audio stretching