Merge branch 'master' into master

2025-02-03 15:52:42 +10:00
parent 4efd20c54b 774edb7b29
commit 6e5861d768
11 changed files with 64 additions and 53 deletions
--- a/src/Ryujinx/UI/Windows/SettingsWindow.axaml
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml
@@ -10,6 +10,7 @@
    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"
@@ -113,7 +114,7 @@
            Spacing="10"
            Orientation="Horizontal"
            HorizontalAlignment="Right"
-            ReverseOrder="{Binding IsMacOS}">
+            ReverseOrder="{x:Static helper:RunningPlatform.IsMacOS}">
            <Button
                Classes="accent"
                Content="{ext:Locale SettingsButtonOk}"