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

Android: Don't assume SliderSetting minimum is 0

This commit is contained in:
JosJuice 2020-09-16 11:59:18 +02:00
parent a7b9e6857b
commit fb2e633e1e
6 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,10 +8,10 @@ public class FloatSliderSetting extends SliderSetting
{
protected AbstractFloatSetting mSetting;
public FloatSliderSetting(AbstractFloatSetting setting, int titleId, int descriptionId, int max,
String units)
public FloatSliderSetting(AbstractFloatSetting setting, int titleId, int descriptionId, int min,
int max, String units)
{
super(titleId, descriptionId, max, units);
super(titleId, descriptionId, min, max, units);
mSetting = setting;
}

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/IntSliderSetting.java
View File

@ -8,10 +8,10 @@ public final class IntSliderSetting extends SliderSetting
{
private AbstractIntSetting mSetting;
public IntSliderSetting(AbstractIntSetting setting, int titleId, int descriptionId, int max,
String units)
public IntSliderSetting(AbstractIntSetting setting, int titleId, int descriptionId, int min,
int max, String units)
{
super(titleId, descriptionId, max, units);
super(titleId, descriptionId, min, max, units);
mSetting = setting;
}

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/PercentSliderSetting.java
View File

@ -6,10 +6,10 @@ import org.dolphinemu.dolphinemu.features.settings.model.Settings;
public final class PercentSliderSetting extends FloatSliderSetting
{
public PercentSliderSetting(AbstractFloatSetting setting, int titleId, int descriptionId, int max,
String units)
public PercentSliderSetting(AbstractFloatSetting setting, int titleId, int descriptionId, int min,
int max, String units)
{
super(setting, titleId, descriptionId, max, units);
super(setting, titleId, descriptionId, min, max, units);
}
@Override

9
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SliderSetting.java
View File

@ -4,18 +4,25 @@ import org.dolphinemu.dolphinemu.features.settings.model.Settings;
public abstract class SliderSetting extends SettingsItem
{
private int mMin;
private int mMax;
private String mUnits;
public SliderSetting(int nameId, int descriptionId, int max, String units)
public SliderSetting(int nameId, int descriptionId, int min, int max, String units)
{
super(nameId, descriptionId);
mMin = min;
mMax = max;
mUnits = units;
}
public abstract int getSelectedValue(Settings settings);
public int getMin()
{
return mMin;
}
public int getMax()
{
return mMax;

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

@ -239,6 +239,7 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
SeekBar seekbar = view.findViewById(R.id.seekbar);
seekbar.setMin(item.getMin());
seekbar.setMax(item.getMax());
seekbar.setProgress(mSeekbarProgress);
seekbar.setKeyProgressIncrement(5);

13
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
View File

@ -234,8 +234,8 @@ public final class SettingsFragmentPresenter
sl.add(new CheckBoxSetting(BooleanSetting.MAIN_OVERRIDE_REGION_SETTINGS,
R.string.override_region_settings, 0));
sl.add(new CheckBoxSetting(BooleanSetting.MAIN_AUTO_DISC_CHANGE, R.string.auto_disc_change, 0));
sl.add(new PercentSliderSetting(FloatSetting.MAIN_EMULATION_SPEED, R.string.speed_limit, 0, 200,
"%"));
sl.add(new PercentSliderSetting(FloatSetting.MAIN_EMULATION_SPEED, R.string.speed_limit, 0, 0,
200, "%"));
sl.add(new CheckBoxSetting(BooleanSetting.MAIN_ANALYTICS_ENABLED, R.string.analytics, 0));
sl.add(new CheckBoxSetting(BooleanSetting.MAIN_ENABLE_SAVESTATES, R.string.enable_save_states,
R.string.enable_save_states_description));
@ -334,7 +334,8 @@ public final class SettingsFragmentPresenter
dspEngineEntries, dspEngineValues));
sl.add(new CheckBoxSetting(BooleanSetting.MAIN_AUDIO_STRETCH, R.string.audio_stretch,
R.string.audio_stretch_description));
sl.add(new IntSliderSetting(IntSetting.MAIN_AUDIO_VOLUME, R.string.audio_volume, 0, 100, "%"));
sl.add(new IntSliderSetting(IntSetting.MAIN_AUDIO_VOLUME, R.string.audio_volume, 0, 0, 100,
"%"));
}
private void addPathsSettings(ArrayList<SettingsItem> sl)
@ -407,7 +408,7 @@ public final class SettingsFragmentPresenter
sl.add(new CheckBoxSetting(BooleanSetting.MAIN_OVERCLOCK_ENABLE, R.string.overclock_enable,
R.string.overclock_enable_description));
sl.add(new PercentSliderSetting(FloatSetting.MAIN_OVERCLOCK, R.string.overclock_title,
R.string.overclock_title_description, 400, "%"));
R.string.overclock_title_description, 0, 400, "%"));
}
private void addGcPadSettings(ArrayList<SettingsItem> sl)
@ -649,9 +650,9 @@ public final class SettingsFragmentPresenter
sl.add(new SingleChoiceSetting(IntSetting.GFX_STEREO_MODE, R.string.stereoscopy_mode, 0,
R.array.stereoscopyEntries, R.array.stereoscopyValues));
sl.add(new IntSliderSetting(IntSetting.GFX_STEREO_DEPTH, R.string.stereoscopy_depth,
R.string.stereoscopy_depth_description, 100, "%"));
R.string.stereoscopy_depth_description, 0, 100, "%"));
sl.add(new IntSliderSetting(IntSetting.GFX_STEREO_CONVERGENCE_PERCENTAGE,
R.string.stereoscopy_convergence, R.string.stereoscopy_convergence_description, 200,
R.string.stereoscopy_convergence, R.string.stereoscopy_convergence_description, 0, 200,
"%"));
sl.add(new CheckBoxSetting(BooleanSetting.GFX_STEREO_SWAP_EYES, R.string.stereoscopy_swap_eyes,
R.string.stereoscopy_swap_eyes_description));