The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-27 08:15:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11413 from t895/sample-window-slider

Browse Source 
Android: Add slider for Performance Sample Window
This commit is contained in:
Mai 2023-01-24 17:22:11 +00:00 committed by GitHub
commit ba6ee9d7ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java
View File

@ -67,6 +67,8 @@ public enum IntSetting implements AbstractIntSetting
GFX_STEREO_CONVERGENCE_PERCENTAGE(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, GFX_STEREO_CONVERGENCE_PERCENTAGE(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY,
"StereoConvergencePercentage", 100), "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), LOGGER_VERBOSITY(Settings.FILE_LOGGER, Settings.SECTION_LOGGER_OPTIONS, "Verbosity", 1),
WIIMOTE_1_SOURCE(Settings.FILE_WIIMOTE, "Wiimote1", "Source", 1), WIIMOTE_1_SOURCE(Settings.FILE_WIIMOTE, "Wiimote1", "Source", 1),

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

@ -286,7 +286,18 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
slider.setValueFrom(item.getMin()); slider.setValueFrom(item.getMin());
slider.setValueTo(item.getMax()); slider.setValueTo(item.getMax());
slider.setValue(mSeekbarProgress); 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); slider.addOnChangeListener(this);
mDialog = new MaterialAlertDialogBuilder(mView.getActivity()) mDialog = new MaterialAlertDialogBuilder(mView.getActivity())

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

@ -907,6 +907,9 @@ public final class SettingsFragmentPresenter
sl.add(new SwitchSetting(mContext, BooleanSetting.GFX_LOG_RENDER_TIME_TO_FILE, 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,
R.string.log_render_time_to_file_description)); 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) private void addAdvancedGraphicsSettings(ArrayList<SettingsItem> sl)

4
Source/Android/app/src/main/res/layout/dialog_slider.xml
View File

@ -17,7 +17,7 @@
<TextView <TextView
android:id="@+id/text_value" android:id="@+id/text_value"
android:layout_width="26dp" android:layout_width="40dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_medlarge" android:layout_marginStart="@dimen/spacing_medlarge"
android:gravity="end" android:gravity="end"
@ -25,7 +25,7 @@
app:layout_constraintEnd_toStartOf="@id/text_units" app:layout_constraintEnd_toStartOf="@id/text_units"
app:layout_constraintStart_toEndOf="@id/slider" app:layout_constraintStart_toEndOf="@id/slider"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="100" /> tools:text="10000" />
<TextView <TextView
android:id="@+id/text_units" android:id="@+id/text_units"

2
Source/Android/app/src/main/res/values/strings.xml
View File

@ -330,6 +330,8 @@
<string name="show_vtimes_description">Shows the average time in ms between each rendered frame alongside the standard deviation.</string> <string name="show_vtimes_description">Shows the average time in ms between each rendered frame alongside the standard deviation.</string>
<string name="show_graphs">Show Performance Graphs</string> <string name="show_graphs">Show Performance Graphs</string>
<string name="show_graphs_description">Shows frametime graph along with statistics as a representation of emulation performance.</string> <string name="show_graphs_description">Shows frametime graph along with statistics as a representation of emulation performance.</string>
<string name="performance_sample_window">Performance Sample Window</string>
<string name="performance_sample_window_description">The amount of time the FPS and VPS counters will sample over. The higher the value, the more stable the FPS/VPS counter will be, but the slower it will be to update.</string>
<string name="show_speed">Show % Speed</string> <string name="show_speed">Show % Speed</string>
<string name="show_speed_description">Shows the % speed of emulation compared to full speed.</string> <string name="show_speed_description">Shows the % speed of emulation compared to full speed.</string>
<string name="show_speed_colors">Show Speed Color</string> <string name="show_speed_colors">Show Speed Color</string>