Merge 6e5861d768 into 774edb7b29

src/Ryujinx.Common/TitleIDs.cs

@@ -47,8 +47,7 @@ namespace Ryujinx.Common
             "01006f8002326000", // Animal Crossings: New Horizons
             "01009bf0072d4000", // Captain Toad: Treasure Tracker
             "01009510001ca000", // Fast RMX
-            "01005CA01580E000", // Persona 5 Royal
-            "0100b880154fc000", // Persona 5 The Royal (Japan)
+            "01005CA01580E000", // Persona 5 Royale
             "010015100b514000", // Super Mario Bros. Wonder
             "0100000000010000", // Super Mario Odyssey
 

src/Ryujinx/UI/Views/Settings/SettingsApplyOverride.axaml

@@ -6,7 +6,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
     mc:Ignorable="d"
     x:DataType="viewModels:SettingsViewModel">
     <Design.DataContext>
@@ -175,7 +174,7 @@
                         </ComboBox>
                     </StackPanel>
                     <CheckBox IsChecked="{Binding UseHypervisor}"
-                              IsVisible="{x:Static helper:RunningPlatform.IsArmMac}"
+                              IsVisible="{Binding IsAppleSiliconMac}"
                               ToolTip.Tip="{ext:Locale UseHypervisorTooltip}">
                         <TextBlock Text="{ext:Locale SettingsTabSystemUseHypervisor}"
                                    ToolTip.Tip="{ext:Locale UseHypervisorTooltip}" />
@@ -205,7 +204,7 @@
                             <ComboBoxItem IsEnabled="{Binding IsOpenGLAvailable}">
                                 <TextBlock Text="OpenGL" />
                             </ComboBoxItem>
-                            <ComboBoxItem IsEnabled="{x:Static helper:RunningPlatform.IsArmMac}">
+                            <ComboBoxItem IsEnabled="{Binding IsAppleSiliconMac}">
                                 <TextBlock Text="Metal (ARM Mac only, Experimental)" />
                             </ComboBoxItem>
                         </ComboBox>

src/Ryujinx/UI/Windows/ArgumentsConfigWindows.axaml

@@ -10,7 +10,6 @@
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     xmlns:settings="clr-namespace:Ryujinx.Ava.UI.Views.Settings"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
-    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
     Width="1100"
     Height="768"
     MinWidth="800"
@@ -92,7 +91,7 @@
             Spacing="10"
             Orientation="Horizontal"
             HorizontalAlignment="Right"
-            ReverseOrder="{x:Static helper:RunningPlatform.IsMacOS}">
+            ReverseOrder="{Binding IsMacOS}">
             <Button
                 Content="{ext:Locale GameListContextMenuCreateShortcut}"
                 Command="{Binding CreateShortcut}" />