UI: compat: remove custom ContentDialog derived type

docs/compatibility.csv

@@ -28,9 +28,9 @@ issue_number,issue_title,extracted_game_id,issue_labels,extracted_status,last_ev
 70,PriPara: All Idol Perfect Stage - 010007F00879E000,010007F00879E000,status-playable,playable,2022-11-22 16:35:52,4
 71,Shantae and the Pirate's Curse - 0100EFD00A4FA000,0100EFD00A4FA000,status-playable,playable,2024-04-29 17:21:57,11
 72,DARK SOULS™: REMASTERED - 01004AB00A260000,01004AB00A260000,gpu;status-ingame;nvdec;online-broken,ingame,2024-04-09 19:47:58,15
-73,The Liar Princess and the Blind Prince,,audio;slow;status-playable,playable,2020-06-08 21:23:28,3
+73,The Liar Princess and the Blind Prince - 010064B00B95C000,010064B00B95C000,audio;slow;status-playable,playable,2020-06-08 21:23:28,3
 74,Dead Cells - 0100646009FBE000,0100646009FBE000,status-playable,playable,2021-09-22 22:18:49,7
-75,Sonic Mania,,status-playable,playable,2020-06-08 17:30:57,6
+75,Sonic Mania - 01009AA000FAA000,01009AA000FAA000,status-playable,playable,2020-06-08 17:30:57,6
 76,The Mahjong,,Needs Update;crash;services;status-nothing,nothing,2021-04-01 22:06:22,6
 77,Angels of Death - 0100AE000AEBC000,0100AE000AEBC000,nvdec;status-playable,playable,2021-02-22 14:17:15,7
 78,Penny-Punching Princess - 0100C510049E0000,0100C510049E0000,status-playable,playable,2022-08-09 13:37:05,6
@@ -4150,7 +4150,7 @@ issue_number,issue_title,extracted_game_id,issue_labels,extracted_status,last_ev
 4801,Fashion Dreamer - 0100E99019B3A000,0100E99019B3A000,status-playable,playable,2023-11-12 6:42:52,2
 4802,THE 密室逃脱 ～牵动命运的三十五道谜团～ (ESCAPE TRICK: 35 Fateful Enigmas) - 010087F005DFE000,010087F005DFE000,,,2023-11-08 2:20:17,1
 4804,Hentai Party - 010071D01CF34000,010071D01CF34000,,,2023-11-11 23:22:36,1
-4809,Hogwarts Legacy 0100F7E00C70E000,0100F7E00C70E000,,,2024-09-03 19:53:58,24
+4809,Hogwarts Legacy 0100F7E00C70E000,0100F7E00C70E000,status-ingame;slow,ingame,2024-09-03 19:53:58,24
 4811,Super Mario RPG - 0100BC0018138000,0100BC0018138000,gpu;audio;status-ingame;nvdec,ingame,2024-06-19 17:43:42,39
 4812,Venatrix - 010063601B386000,010063601B386000,,,2023-11-18 6:55:12,1
 4813,Dreamwork's All-Star Kart Racing - 010037401A374000,010037401A374000,Incomplete,,2024-02-27 8:58:57,2
@@ -4244,7 +4244,7 @@ issue_number,issue_title,extracted_game_id,issue_labels,extracted_status,last_ev
 4967,Biomutant - 01004BA017CD6000,01004BA017CD6000,status-ingame;crash,ingame,2024-05-16 15:46:36,2
 4968,Vampire Survivors - 010089A0197E4000,010089A0197E4000,status-ingame,ingame,2024-06-17 9:57:38,2
 4969,Koumajou Remilia II Stranger’s Requiem,,Incomplete,,2024-05-22 20:59:04,3
-4972,Paper Mario: The Thousand-Year Door - 0100ECD018EBE000,0100ECD018EBE000,gpu;status-ingame;intel-vendor-bug,ingame,2024-08-06 1:02:25,79
+4972,Paper Mario: The Thousand-Year Door - 0100ECD018EBE000,0100ECD018EBE000,gpu;status-ingame;intel-vendor-bug;slow,ingame,2025-01-07 4:27:35,80
 4973,Stories From Sol: The Gun-dog Demo - 010092A01EC94000,010092A01EC94000,,,2024-05-22 19:55:35,1
 4977,Earth Defense Force: World Brothers 2 - 010083a01d456000,010083a01d456000,,,2024-06-01 18:34:34,1
 4985,锈色湖畔：内在昔日（Rusty Lake: The Past Within) - 01007010157EC000,01007010157EC000,,,2024-06-10 13:47:40,1
@@ -4286,18 +4286,23 @@ issue_number,issue_title,extracted_game_id,issue_labels,extracted_status,last_ev
 5056,Taisho x Alice ALL IN ONE - 大正×対称アリス ALL IN ONE - 010096000ca38000,010096000ca38000,,,2024-09-11 21:20:04,2
 5057,NBA 2K25 - 0100DFF01ED44000,0100DFF01ED44000,,,2024-09-10 17:34:54,1
 5059,逆转检察官1&2 御剑精选集 (Ace Attorney Investigations Collection) - 010005501E68C000,010005501E68C000,status-playable,playable,2024-09-19 16:38:05,4
-5062,Fabledom,,,,2024-09-28 12:12:55,2
+5062,Fabledom - 0100B6001E6D6000,0100B6001E6D6000,,,2024-09-28 12:12:55,2
 5064,BZZZT - 010091201A3F2000,010091201A3F2000,,,2024-09-22 21:29:58,1
 5065,EA SPORTS FC 25 - 010054E01D878000,010054E01D878000,status-ingame;crash,ingame,2024-09-25 21:07:50,13
 5067,Selfloss - 010036C01E244000,010036C01E244000,,,2024-09-23 23:12:13,1
 5068,Disney Epic Mickey: Rebrushed - 0100DA201EBF8000,0100DA201EBF8000,status-ingame;crash,ingame,2024-09-26 22:11:51,4
 5069,The Plucky Squire - 01006BD018B54000,01006BD018B54000,status-ingame;crash,ingame,2024-09-27 22:32:33,4
-5070,The Legend of Zelda Echoes of Wisdom - 01008CF01BAAC000,01008CF01BAAC000,status-playable;nvdec;ASTC,playable,2024-10-01 14:11:01,34
-5071,Bakeru ,,,,2024-09-25 18:05:22,1
+5070,The Legend of Zelda Echoes of Wisdom - 01008CF01BAAC000,01008CF01BAAC000,status-playable;nvdec;ASTC;intel-vendor-bug,playable,2024-10-01 14:11:01,34
+5071,Bakeru - 01007CD01FAE0000,01007CD01FAE0000,,,2024-09-25 18:05:22,1
 5072,トラブル・マギア ～訳アリ少女は未来を勝ち取るために異国の魔法学校へ留学します～(Trouble Magia ~Wakeari Shoujo wa Mirai o Kachitoru Tame ni Ikoku no Mahou Gakkou e Ryuugaku Shimasu~) - 01000BB01CB8A000,01000BB01CB8A000,status-nothing,nothing,2024-09-28 7:03:14,3
 5073,I am an Airtraffic Controller AIRPORT HERO HANEDA ALLSTARS - 01002EE01BAE0000,01002EE01BAE0000,,,2024-09-27 2:04:17,1
 5074,燃えよ！ 乙女道士 ～華遊恋語～ (Moeyo! Otome Doushi Kayu Koigatari) - 01001BA01EBFC000,01001BA01EBFC000,services-horizon;status-nothing,nothing,2024-09-28 12:22:55,5
 5075,I am an Air Traffic Controller AIRPORT HERO HANEDA - 0100BE700EDA4000,0100BE700EDA4000,,,2024-09-27 23:52:19,1
 5077,Angel at Dusk Demo - 0100D96020ADC000,0100D96020ADC000,,,2024-09-29 17:21:13,1
 5078,Monster Jam™ Showdown - 0100CE101B698000,0100CE101B698000,,,2024-09-30 4:03:13,1
-5079,Legend of Heroes: Trails Through Daybreak - 010040C01D248000,010040C01D248000,,,2024-10-01 7:36:25,1
+5079,Legend of Heroes: Trails Through Daybreak - 010040C01D248000,010040C01D248000,,,2024-10-01 7:36:25,1
+100001,Mario & Luigi: Brothership - 01006D0017F7A000,01006D0017F7A000,status-ingame;crash;slow;UE4;mac-bug,ingame,2025-01-07 4:00:00,1
+100002,Stray - 010075101EF84000,010075101EF84000,status-ingame;crash,ingame,2025-01-07 4:03:00,1
+100003,Dragon Quest III HD-2D Remake - 01003E601E324000,01003E601E324000,status-ingame;vulkan-backend-bug;UE4;audout;mac-bug,ingame,2025-01-07 4:10:27,1
+100004,SONIC X SHADOW GENERATIONS - 01005EA01C0fC000,01005EA01C0fC000,status-ingame;crash,ingame,2025-01-07 4:20:45,1
+100005,LEGO Horizon Adventures - 010073C01AF34000,010073C01AF34000,status-ingame;vulkan-backend-bug;opengl-backend-bug;UE4,ingame,2025-01-07 4:24:56,1

src/Ryujinx/Assets/Styles/Styles.xaml

@@ -402,7 +402,7 @@
         <x:Double x:Key="ControlContentThemeFontSize">13</x:Double>
         <x:Double x:Key="MenuItemHeight">26</x:Double>
         <x:Double x:Key="TabItemMinHeight">28</x:Double>
-        <x:Double x:Key="ContentDialogMaxWidth">700</x:Double>
+        <x:Double x:Key="ContentDialogMaxWidth">900</x:Double>
         <x:Double x:Key="ContentDialogMaxHeight">756</x:Double>
     </Styles.Resources>
 </Styles>

src/Ryujinx/Assets/locales.json

@@ -22597,6 +22597,31 @@
         "zh_TW": ""
       }
     },
+    {
+      "ID": "CompatibilityListWarning",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "This compatibility list might contain out of date entries.\nDo not be opposed to testing games in the \"Ingame\" status.",
+        "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": "CompatibilityListSearchBoxWatermark",
       "Translations": {

src/Ryujinx/Ryujinx.csproj

@@ -171,12 +171,6 @@
   <ItemGroup>
     <AdditionalFiles Include="Assets\locales.json" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Utilities\Compat\CompatibilityContentDialog.axaml.cs">
-      <DependentUpon>CompatibilityContentDialog.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="Assets\Fonts\Mono\" />
   </ItemGroup>

src/Ryujinx/Utilities/Compat/CompatibilityContentDialog.axaml

@@ -1,20 +0,0 @@
-<ui:ContentDialog xmlns="https://github.com/avaloniaui"
-                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                  xmlns:local="using:Ryujinx.Ava.Utilities.Compat"
-                  xmlns:ui="using:FluentAvalonia.UI.Controls"
-                  xmlns:ext="using:Ryujinx.Ava.Common.Markup"
-                  x:Class="Ryujinx.Ava.Utilities.Compat.CompatibilityContentDialog"
-                  mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="400"
-                  CloseButtonText="{ext:Locale SettingsButtonClose}" 
-                  DefaultButton="Close"
-                  x:DataType="local:CompatibilityViewModel">
-    <ui:ContentDialog.DataContext>
-        <local:CompatibilityViewModel/>
-    </ui:ContentDialog.DataContext>
-    <ui:ContentDialog.Resources>
-        <x:Double x:Key="ContentDialogMaxWidth">900</x:Double>
-    </ui:ContentDialog.Resources>
-</ui:ContentDialog>
-

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

@@ -1,13 +0,0 @@
-using FluentAvalonia.UI.Controls;
-using System;
-
-namespace Ryujinx.Ava.Utilities.Compat
-{
-    public partial class CompatibilityContentDialog : ContentDialog
-    {
-        protected override Type StyleKeyOverride => typeof(ContentDialog);
-        
-        public CompatibilityContentDialog() => InitializeComponent();
-    }
-}
-

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml

@@ -4,6 +4,7 @@
              xmlns:local="using:Ryujinx.Ava.Utilities.Compat"
              xmlns:helpers="using:Ryujinx.Ava.UI.Helpers"
              xmlns:ext="using:Ryujinx.Ava.Common.Markup"
+             xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Ryujinx.Ava.Utilities.Compat.CompatibilityList"
@@ -11,13 +12,33 @@
     <UserControl.DataContext>
         <local:CompatibilityViewModel />
     </UserControl.DataContext>
-    <Grid RowDefinitions="Auto,*">
-        <Grid Grid.Row="0" ColumnDefinitions="*,Auto,Auto">
+    <Grid RowDefinitions="*,Auto,*">
+        <Grid 
+            Grid.Row="0"
+            HorizontalAlignment="Center"
+            ColumnDefinitions="Auto,*"
+            Margin="0 0 0 10">
+            <ui:FontIcon
+                Grid.Column="0"
+                Margin="0"
+                HorizontalAlignment="Stretch"
+                FontFamily="avares://FluentAvalonia/Fonts#Symbols"
+                Glyph="{helpers:GlyphValueConverter Important}" />
+            <!-- NOTE: aligning to bottom for better visual alignment with glyph -->
+            <TextBlock
+                Grid.Column="1"
+                Margin="5, 0, 0, 0"
+                FontStyle="Italic"
+                VerticalAlignment="Center"
+                TextWrapping="Wrap"
+                Text="{ext:Locale CompatibilityListWarning}" />
+        </Grid>
+        <Grid Grid.Row="1" ColumnDefinitions="*,Auto,Auto">
             <TextBox Grid.Column="0" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermark}" TextChanged="TextBox_OnTextChanged" />
             <CheckBox Grid.Column="1" Margin="7, 0, 0, 0" IsChecked="{Binding OnlyShowOwnedGames}" />
             <TextBlock Grid.Column="2" Margin="-10, 0, 0, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
         </Grid>
-        <ScrollViewer Grid.Row="1">
+        <ScrollViewer Grid.Row="2">
                 <ListBox Margin="0,5, 0, 0"
                          Background="Transparent"
                          ItemsSource="{Binding CurrentEntries}">

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

@@ -1,6 +1,8 @@
 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;
@@ -19,11 +21,17 @@ namespace Ryujinx.Ava.Utilities.Compat
                 csvStream.Position = 0;
 
                 CompatibilityCsv.Shared = new CompatibilityCsv(Sep.Reader().From(csvStream));
-            } 
+            }
             
-            CompatibilityContentDialog contentDialog = new()
+            ContentDialog contentDialog = new()
             {
-                Content = new CompatibilityList { DataContext = new CompatibilityViewModel(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary) }
+                PrimaryButtonText = string.Empty,
+                SecondaryButtonText = string.Empty,
+                CloseButtonText = LocaleManager.Instance[LocaleKeys.SettingsButtonClose],
+                Content = new CompatibilityList
+                {
+                    DataContext = new CompatibilityViewModel(RyujinxApp.MainWindow.ViewModel.ApplicationLibrary)
+                }
             };
 
             Style closeButton = new(x => x.Name("CloseButton"));