Merge branch 'XForYouX-dev' into dev

This commit is contained in:
Crimson-Hawk 2024-03-23 08:59:48 +08:00
commit 16841915fd
No known key found for this signature in database
GPG key ID: 0804DD39BB9BF5AC
2 changed files with 3 additions and 0 deletions

View file

@ -142,6 +142,7 @@
<item>@string/ratio_force_four_three</item> <item>@string/ratio_force_four_three</item>
<item>@string/ratio_force_twenty_one_nine</item> <item>@string/ratio_force_twenty_one_nine</item>
<item>@string/ratio_force_sixteen_ten</item> <item>@string/ratio_force_sixteen_ten</item>
<item>@string/ratio_thirty_two_nine</item>
<item>@string/ratio_stretch</item> <item>@string/ratio_stretch</item>
</string-array> </string-array>
@ -151,6 +152,7 @@
<item>2</item> <item>2</item>
<item>3</item> <item>3</item>
<item>4</item> <item>4</item>
<item>5</item>
</integer-array> </integer-array>
<string-array name="rendererScalingFilterNames"> <string-array name="rendererScalingFilterNames">

View file

@ -601,6 +601,7 @@
<string name="ratio_force_four_three">Force 4:3</string> <string name="ratio_force_four_three">Force 4:3</string>
<string name="ratio_force_twenty_one_nine">Force 21:9</string> <string name="ratio_force_twenty_one_nine">Force 21:9</string>
<string name="ratio_force_sixteen_ten">Force 16:10</string> <string name="ratio_force_sixteen_ten">Force 16:10</string>
<string name="ratio_force_thirty_two_nine">Force 32:9</string>
<string name="ratio_stretch">Stretch to window</string> <string name="ratio_stretch">Stretch to window</string>
<!-- CPU Backend --> <!-- CPU Backend -->