VERY experimental Nintendo Switch 2 emulator
C++
[frontend] change order of filters to match append rules (#2696)
crueter954c17c18a5e
diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xmlindex 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.hindex 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.cppindex 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(),{