diff options
| author | Mai <mai.iam2048@gmail.com> | 2023-01-24 17:22:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-24 17:22:11 +0000 |
| commit | ba6ee9d7ba9730e5b2165ff0ee18cbc23762b129 (patch) | |
| tree | c0ec8b1ce200ffc35b5d8592773fdb86ff7ff547 /Source/Android/app/src/main/java | |
| parent | f4a8f80228e6286f47d19a111a721abfbe1efce1 (diff) | |
| parent | 937e08980ecf7289d86e2e7fd83f09b78f7a52ac (diff) | |
Merge pull request #11413 from t895/sample-window-slider
Android: Add slider for Performance Sample Window
Diffstat (limited to 'Source/Android/app/src/main/java')
3 files changed, 17 insertions, 1 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java index c7f2b0c54c..69b422ce54 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java @@ -67,6 +67,8 @@ public enum IntSetting implements AbstractIntSetting GFX_STEREO_CONVERGENCE_PERCENTAGE(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoConvergencePercentage", 100), + GFX_PERF_SAMP_WINDOW(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "PerfSampWindowMS", 1000), + LOGGER_VERBOSITY(Settings.FILE_LOGGER, Settings.SECTION_LOGGER_OPTIONS, "Verbosity", 1), WIIMOTE_1_SOURCE(Settings.FILE_WIIMOTE, "Wiimote1", "Source", 1), 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 b51d87e5a9..c15c0d4498 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 @@ -286,7 +286,18 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde slider.setValueFrom(item.getMin()); slider.setValueTo(item.getMax()); slider.setValue(mSeekbarProgress); - slider.setStepSize(1); + + // Sliders can get frustrating to use with a small step size and large ranges + int maxRange = item.getMax(); + if (maxRange <= 100) + { + slider.setStepSize(1); + } + else + { + slider.setStepSize((int) Math.pow(10, Math.ceil(Math.log10(maxRange)) - 2)); + } + slider.addOnChangeListener(this); mDialog = new MaterialAlertDialogBuilder(mView.getActivity()) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java index 8818ae57ba..93bd5bbf2e 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java @@ -907,6 +907,9 @@ public final class SettingsFragmentPresenter sl.add(new SwitchSetting(mContext, BooleanSetting.GFX_LOG_RENDER_TIME_TO_FILE, R.string.log_render_time_to_file, R.string.log_render_time_to_file_description)); + sl.add(new IntSliderSetting(mContext, IntSetting.GFX_PERF_SAMP_WINDOW, + R.string.performance_sample_window, R.string.performance_sample_window_description, 0, + 10000, "ms")); } private void addAdvancedGraphicsSettings(ArrayList<SettingsItem> sl) |