Merge 6b44f32448 into e676fd8b17

Rebased to resolve PR conflicts

distribution/macos/shortcut-template.plist

@@ -19,7 +19,7 @@
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2018 - 2025 Ryujinx Team and Contributors.</string>
+	<string>Copyright © 2018 - 2023 Ryujinx Team and Contributors.</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.games</string>
 	<key>LSMinimumSystemVersion</key>

docs/compatibility.csv

@@ -965,7 +965,6 @@
 0100C4D00B608000,"Don't Sink",gpu,ingame,2021-02-26 15:41:11
 0100751007ADA000,"Don't Starve: Nintendo Switch Edition",nvdec,playable,2022-02-05 20:43:34
 010088B010DD2000,"Dongo Adventure",,playable,2022-10-04 16:22:26
-01009D901BC56000,"Donkey Kong Country™ Returns HD",gpu;crashes,ingame,2025-01-19 18:26:53
 0100C1F0051B6000,"Donkey Kong Country™: Tropical Freeze",,playable,2024-08-05 16:46:10
 0100F2C00F060000,"Doodle Derby",,boots,2020-12-04 22:51:48
 0100416004C00000,"DOOM",gpu;slow;nvdec;online-broken,ingame,2024-09-23 15:40:07

src/Ryujinx/AppHost.cs

@@ -1040,7 +1040,7 @@ namespace Ryujinx.Ava
                     _viewModel.WindowState = WindowState.FullScreen;
                 }
 
-                if (_viewModel.WindowState is WindowState.FullScreen)
+                if (_viewModel.WindowState is WindowState.FullScreen || _viewModel.StartGamesWithoutUI)
                 {
                     _viewModel.ShowMenuAndStatusBar = false;
                 }

src/Ryujinx/Assets/locales.json

@@ -572,6 +572,31 @@
         "zh_TW": "使用全螢幕模式啟動遊戲"
       }
     },
+    {
+      "ID": "MenuBarOptionsStartGamesWithoutUI",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Start Games with UI Hidden",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "MenuBarOptionsStopEmulation",
       "Translations": {

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -38,6 +38,7 @@ using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption;
 using Ryujinx.HLE.UI;
 using Ryujinx.Input.HLE;
+using Silk.NET.Vulkan;
 using SkiaSharp;
 using System;
 using System.Collections.Generic;
@@ -488,6 +489,19 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        public bool StartGamesWithoutUI
+        {
+            get => ConfigurationState.Instance.UI.StartNoUI;
+            set
+            {
+                ConfigurationState.Instance.UI.StartNoUI.Value = value;
+
+                ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);
+
+                OnPropertyChanged();
+            }
+        }
+
         public bool ShowConsole
         {
             get => ConfigurationState.Instance.UI.ShowConsole;
@@ -1195,6 +1209,11 @@ namespace Ryujinx.Ava.UI.ViewModels
             StartGamesInFullscreen = !StartGamesInFullscreen;
         }
 
+        public void ToggleStartGamesWithoutUI()
+        {
+            StartGamesWithoutUI = !StartGamesWithoutUI;
+        }
+
         public void ToggleShowConsole()
         {
             ShowConsole = !ShowConsole;

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml

@@ -119,6 +119,29 @@
                         </Style>
                     </MenuItem.Styles>
                 </MenuItem>
+                <MenuItem
+                    Padding="0"
+                    Command="{Binding ToggleStartGamesWithoutUI}"
+                    Header="{ext:Locale MenuBarOptionsStartGamesWithoutUI}">
+                    <MenuItem.Icon>
+                        <CheckBox
+                            MinWidth="{DynamicResource CheckBoxSize}"
+                            MinHeight="{DynamicResource CheckBoxSize}"
+                            IsChecked="{Binding StartGamesWithoutUI, Mode=TwoWay}"
+                            Padding="0" />
+                    </MenuItem.Icon>
+                    <MenuItem.Styles>
+                        <Style Selector="Viewbox#PART_IconPresenter">
+                            <Setter Property="MaxHeight" Value="36" />
+                            <Setter Property="MinHeight" Value="36" />
+                            <Setter Property="MaxWidth" Value="36" />
+                            <Setter Property="MinWidth" Value="36" />
+                        </Style>
+                        <Style Selector="ContentPresenter#PART_HeaderPresenter">
+                            <Setter Property="Padding" Value="-10,0,0,0" />
+                        </Style>
+                    </MenuItem.Styles>
+                </MenuItem>
                 <MenuItem
                     Padding="0"
                     IsVisible="{Binding ShowConsoleVisible}"

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs

@@ -144,14 +144,14 @@ namespace Ryujinx.Ava.UI.Views.Main
             ViewModel.LoadConfigurableHotKeys();
         }
 
-        public AppletMetadata MiiApplet => new(ViewModel.ContentManager, "miiEdit", 0x0100000000001009);
-        
+        public static readonly AppletMetadata MiiApplet = new("miiEdit", 0x0100000000001009);
+
         public async Task OpenMiiApplet()
         {
-            if (!MiiApplet.CanStart(out var appData, out var nacpData)) 
-                return;
-            
-            await ViewModel.LoadApplication(appData, ViewModel.IsFullScreen || ViewModel.StartGamesInFullscreen, nacpData);
+            if (MiiApplet.CanStart(ViewModel.ContentManager, out var appData, out var nacpData))
+            {
+                await ViewModel.LoadApplication(appData, ViewModel.IsFullScreen || ViewModel.StartGamesInFullscreen, nacpData);
+            }
         }
 
         public async Task OpenCheatManagerForCurrentApp()

src/Ryujinx/Utilities/AppletMetadata.cs

@@ -54,9 +54,5 @@ namespace Ryujinx.Ava.Utilities
             appControl = new BlitStruct<ApplicationControlProperty>(0);
             return false;
         }
-
-        public bool CanStart(out ApplicationData appData,
-            out BlitStruct<ApplicationControlProperty> appControl)
-            => CanStart(null, out appData, out appControl);
     }
 }

src/Ryujinx/Utilities/Compat/CompatibilityCsv.cs

@@ -28,9 +28,7 @@ namespace Ryujinx.Ava.Utilities.Compat
     
     public class CompatibilityCsv
     {
-        static CompatibilityCsv() => Load();
-
-        public static void Load()
+        static CompatibilityCsv()
         {
             using Stream csvStream = Assembly.GetExecutingAssembly()
                 .GetManifestResourceStream("RyujinxGameCompatibilityList")!;
@@ -39,31 +37,15 @@ namespace Ryujinx.Ava.Utilities.Compat
             using SepReader reader = Sep.Reader().From(csvStream);
             ColumnIndices columnIndices = new(reader.Header.IndexOf);
 
-            _entries = reader
+            Entries = reader
                 .Enumerate(row => new CompatibilityEntry(ref columnIndices, row))
                 .OrderBy(it => it.GameName)
                 .ToArray();
             
-            Logger.Debug?.Print(LogClass.UI, "Compatibility CSV loaded.", "LoadCompatibility");
+            Logger.Debug?.Print(LogClass.UI, "Compatibility CSV loaded.", "LoadCompatCsv");
         }
 
-        public static void Unload()
-        {
-            _entries = null;
-        }
-
-        private static CompatibilityEntry[] _entries;
-        
-        public static CompatibilityEntry[] Entries 
-        {
-            get
-            {
-                if (_entries == null)
-                    Load();
-                
-                return _entries;
-            }
-        }
+        public static CompatibilityEntry[] Entries { get; private set; }
     }
 
     public class CompatibilityEntry

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml.cs

@@ -1,8 +1,11 @@
 using Avalonia.Controls;
 using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
+using nietras.SeparatedValues;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
+using System.IO;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.Utilities.Compat
@@ -32,8 +35,6 @@ namespace Ryujinx.Ava.Utilities.Compat
             contentDialog.Styles.Add(closeButtonParent);
 
             await ContentDialogHelper.ShowAsync(contentDialog);
-            
-            CompatibilityCsv.Unload();
         }
         
         public CompatibilityList()

src/Ryujinx/Utilities/Compat/CompatibilityViewModel.cs

@@ -1,18 +1,19 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using ExCSS;
 using Gommon;
-using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using System.Collections.Generic;
 using System.Linq;
 
 namespace Ryujinx.Ava.Utilities.Compat
 {
-    public class CompatibilityViewModel : BaseModel
+    public partial class CompatibilityViewModel : ObservableObject
     {
-        private bool _onlyShowOwnedGames = true;
+        [ObservableProperty] private bool _onlyShowOwnedGames = true;
 
         private IEnumerable<CompatibilityEntry> _currentEntries = CompatibilityCsv.Entries;
-        private string[] _ownedGameTitleIds = [];
+        private readonly string[] _ownedGameTitleIds = [];
+        private readonly ApplicationLibrary _appLibrary;
 
         public IEnumerable<CompatibilityEntry> CurrentEntries => OnlyShowOwnedGames
             ? _currentEntries.Where(x =>
@@ -23,23 +24,14 @@ namespace Ryujinx.Ava.Utilities.Compat
 
         public CompatibilityViewModel(ApplicationLibrary appLibrary)
         {
-            appLibrary.ApplicationCountUpdated += (_, _) 
-                => _ownedGameTitleIds = appLibrary.Applications.Keys.Select(x => x.ToString("X16")).ToArray();
-            
+            _appLibrary = appLibrary;
             _ownedGameTitleIds = appLibrary.Applications.Keys.Select(x => x.ToString("X16")).ToArray();
-        }
 
-        public bool OnlyShowOwnedGames
-        {
-            get => _onlyShowOwnedGames;
-            set
+            PropertyChanged += (_, args) =>
             {
-                OnPropertyChanging();
-                OnPropertyChanging(nameof(CurrentEntries));
-                _onlyShowOwnedGames = value;
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(CurrentEntries));
-            }
+                if (args.PropertyName is nameof(OnlyShowOwnedGames))
+                    OnPropertyChanged(nameof(CurrentEntries));
+            };
         }
 
         public void Search(string searchTerm)

src/Ryujinx/Utilities/Configuration/ConfigurationFileFormat.cs

@@ -17,7 +17,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 59;
+        public const int CurrentVersion = 60;
 
         /// <summary>
         /// Version of the configuration file format
@@ -351,6 +351,11 @@ namespace Ryujinx.Ava.Utilities.Configuration
         /// </summary>
         public bool StartFullscreen { get; set; }
 
+        /// <summary>
+        /// Start games with UI hidden
+        /// </summary>
+        public bool StartNoUI { get; set; }
+
         /// <summary>
         /// Show console window
         /// </summary>

src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs

@@ -127,6 +127,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             UI.GridSize.Value = cff.GridSize;
             UI.ApplicationSort.Value = cff.ApplicationSort;
             UI.StartFullscreen.Value = cff.StartFullscreen;
+            UI.StartNoUI.Value = cff.StartNoUI;
             UI.ShowConsole.Value = cff.ShowConsole;
             UI.WindowStartup.WindowSizeWidth.Value = cff.WindowStartup.WindowSizeWidth;
             UI.WindowStartup.WindowSizeHeight.Value = cff.WindowStartup.WindowSizeHeight;
@@ -414,7 +415,8 @@ namespace Ryujinx.Ava.Utilities.Configuration
                     // This was accidentally enabled by default when it was PRed. That is not what we want,
                     // so as a compromise users who want to use it will simply need to re-enable it once after updating.
                     cff.IgnoreApplet = false;
-                })
+                }),
+                (60, static cff => cff.StartNoUI = false)
             );
     }
 }

src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs

@@ -152,6 +152,11 @@ namespace Ryujinx.Ava.Utilities.Configuration
             /// </summary>
             public ReactiveObject<bool> StartFullscreen { get; private set; }
 
+            /// <summary>
+            /// Start games with UI hidden
+            /// </summary>
+            public ReactiveObject<bool> StartNoUI { get; private set; }
+
             /// <summary>
             /// Hide / Show Console Window
             /// </summary>
@@ -192,6 +197,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 WindowStartup = new WindowStartupSettings();
                 BaseStyle = new ReactiveObject<string>();
                 StartFullscreen = new ReactiveObject<bool>();
+                StartNoUI = new ReactiveObject<bool>();
                 GameListViewMode = new ReactiveObject<int>();
                 ShowNames = new ReactiveObject<bool>();
                 GridSize = new ReactiveObject<int>();

src/Ryujinx/Utilities/Configuration/ConfigurationState.cs

@@ -125,6 +125,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 ApplicationSort = UI.ApplicationSort,
                 IsAscendingOrder = UI.IsAscendingOrder,
                 StartFullscreen = UI.StartFullscreen,
+                StartNoUI = UI.StartNoUI,
                 ShowConsole = UI.ShowConsole,
                 EnableKeyboard = Hid.EnableKeyboard,
                 EnableMouse = Hid.EnableMouse,
@@ -233,6 +234,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             UI.ApplicationSort.Value = 0;
             UI.IsAscendingOrder.Value = true;
             UI.StartFullscreen.Value = false;
+            UI.StartNoUI.Value = false;
             UI.ShowConsole.Value = true;
             UI.WindowStartup.WindowSizeWidth.Value = 1280;
             UI.WindowStartup.WindowSizeHeight.Value = 760;