diff options
| author | crueter <crueter@eden-emu.dev> | 2025-10-08 06:39:58 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2025-10-08 06:39:58 +0200 |
| commit | 954c17c18a5e6a39c4f7edd80bbb4a1e0507d4e0 (patch) | |
| tree | 3dc3b3bedf0edb245d83877c5dd8a6988edc23b2 | |
| parent | 8078990b9b95c5bb2c432abc9012c2738f8a451a (diff) | |
[frontend] change order of filters to match append rules (#2696)
otherwise, FSR would change to Gaussian etc.
in general, sans resolution, new enum values should always be appended
Signed-off-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2696
Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>
Reviewed-by: Lizzie <lizzie@eden-emu.dev>
| -rw-r--r-- | src/android/app/src/main/res/values/arrays.xml | 8 | ||||
| -rw-r--r-- | src/common/settings_enums.h | 2 | ||||
| -rw-r--r-- | src/qt_common/shared_translation.cpp | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml index 7e44750909..2150d401db 100644 --- a/src/android/app/src/main/res/values/arrays.xml +++ b/src/android/app/src/main/res/values/arrays.xml @@ -253,16 +253,16 @@ <item>@string/scaling_filter_nearest_neighbor</item> <item>@string/scaling_filter_bilinear</item> <item>@string/scaling_filter_bicubic</item> - <item>@string/scaling_filter_zero_tangent</item> - <item>@string/scaling_filter_bspline</item> - <item>@string/scaling_filter_mitchell</item> - <item>@string/scaling_filter_spline1</item> <item>@string/scaling_filter_gaussian</item> <item>@string/scaling_filter_lanczos</item> <item>@string/scaling_filter_scale_force</item> <item>@string/scaling_filter_fsr</item> <item>@string/scaling_filter_area</item> <item>@string/scaling_filter_mmpx</item> + <item>@string/scaling_filter_zero_tangent</item> + <item>@string/scaling_filter_bspline</item> + <item>@string/scaling_filter_mitchell</item> + <item>@string/scaling_filter_spline1</item> </string-array> <integer-array name="rendererScalingFilterValues"> diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h index 3fcdf08256..ccf6f1cfb2 100644 --- a/src/common/settings_enums.h +++ b/src/common/settings_enums.h @@ -143,7 +143,7 @@ ENUM(ConfirmStop, Ask_Always, Ask_Based_On_Game, Ask_Never); ENUM(FullscreenMode, Borderless, Exclusive); ENUM(NvdecEmulation, Off, Cpu, Gpu); ENUM(ResolutionSetup, Res1_4X, Res1_2X, Res3_4X, Res1X, Res5_4X, Res3_2X, Res2X, Res3X, Res4X, Res5X, Res6X, Res7X, Res8X); -ENUM(ScalingFilter, NearestNeighbor, Bilinear, Bicubic, ZeroTangent, BSpline, Mitchell, Spline1, Gaussian, Lanczos, ScaleForce, Fsr, Area, Mmpx, MaxEnum); +ENUM(ScalingFilter, NearestNeighbor, Bilinear, Bicubic, Gaussian, Lanczos, ScaleForce, Fsr, Area, ZeroTangent, BSpline, Mitchell, Spline1, Mmpx, MaxEnum); ENUM(AntiAliasing, None, Fxaa, Smaa, MaxEnum); ENUM(AspectRatio, R16_9, R4_3, R21_9, R16_10, Stretch); ENUM(ConsoleMode, Handheld, Docked); diff --git a/src/qt_common/shared_translation.cpp b/src/qt_common/shared_translation.cpp index 0b40ca9904..054d28e8e2 100644 --- a/src/qt_common/shared_translation.cpp +++ b/src/qt_common/shared_translation.cpp @@ -549,16 +549,16 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QObject* parent) PAIR(ScalingFilter, NearestNeighbor, tr("Nearest Neighbor")), PAIR(ScalingFilter, Bilinear, tr("Bilinear")), PAIR(ScalingFilter, Bicubic, tr("Bicubic")), - PAIR(ScalingFilter, ZeroTangent, tr("Zero-Tangent")), - PAIR(ScalingFilter, BSpline, tr("B-Spline")), - PAIR(ScalingFilter, Mitchell, tr("Mitchell")), - PAIR(ScalingFilter, Spline1, tr("Spline-1")), PAIR(ScalingFilter, Gaussian, tr("Gaussian")), PAIR(ScalingFilter, Lanczos, tr("Lanczos")), PAIR(ScalingFilter, ScaleForce, tr("ScaleForce")), PAIR(ScalingFilter, Fsr, tr("AMD FidelityFX™️ Super Resolution")), PAIR(ScalingFilter, Area, tr("Area")), PAIR(ScalingFilter, Mmpx, tr("MMPX")), + PAIR(ScalingFilter, ZeroTangent, tr("Zero-Tangent")), + PAIR(ScalingFilter, BSpline, tr("B-Spline")), + PAIR(ScalingFilter, Mitchell, tr("Mitchell")), + PAIR(ScalingFilter, Spline1, tr("Spline-1")), }}); translations->insert({Settings::EnumMetadata<Settings::AntiAliasing>::Index(), { |