Start AboutWindow refactor

Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs

@@ -1015,7 +1015,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public async void OpenAboutWindow()
         {
-            await new AboutWindow().ShowDialog(_owner);
+            await AboutWindow.Show();
         }
 
         public void ChangeLanguage(object obj)

Ryujinx.Ava/UI/Windows/AboutWindow.axaml

@@ -1,21 +1,16 @@
-<window:StyleableWindow
+<UserControl
-    x:Class="Ryujinx.Ava.UI.Windows.AboutWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:flex="clr-namespace:Avalonia.Flexbox;assembly=Avalonia.Flexbox"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
-    Width="850"
-    Height="550"
-    MinWidth="500"
-    MinHeight="550"
-    d:DesignHeight="350"
-    d:DesignWidth="400"
-    CanResize="False"
-    SizeToContent="Width"
-    WindowStartupLocation="CenterOwner"
     mc:Ignorable="d"
+    d:DesignHeight="500"
+    d:DesignWidth="750"
+    Height="500"
+    Width="750"
+    x:Class="Ryujinx.Ava.UI.Windows.AboutWindow"
     Focusable="True">
 	<Grid
         Margin="15"
@@ -37,48 +32,35 @@
             HorizontalAlignment="Stretch"
             VerticalAlignment="Stretch">
 			<Grid.RowDefinitions>
-				<RowDefinition Height="*" />
-				<RowDefinition Height="*" />
-				<RowDefinition />
-				<RowDefinition />
 				<RowDefinition Height="Auto" />
+				<RowDefinition Height="*" />
 			</Grid.RowDefinitions>
 			<Grid Grid.Row="0">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition />
 					<ColumnDefinition />
 				</Grid.ColumnDefinitions>
-				<Grid.RowDefinitions>
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-				</Grid.RowDefinitions>
 				<Image
-                    Grid.Row="0"
-                    Grid.RowSpan="3"
                     Grid.Column="0"
-                    Height="110"
+                    Height="100"
-                    MinWidth="50"
-                    Margin="5,10,20,10"
                     Source="resm:Ryujinx.Ui.Common.Resources.Logo_Ryujinx.png?assembly=Ryujinx.Ui.Common" />
-				<TextBlock
+				<flex:FlexPanel
-                    Grid.Row="0"
 					Grid.Column="1"
-                    Margin="0,20,0,0"
+					HorizontalAlignment="Stretch"
+					VerticalAlignment="Stretch"
+					JustifyContent="SpaceBetween"
+					AlignContent="Center"
+					Direction="Column"
+					Margin="5">
+					<TextBlock
 						FontSize="35"
 						Text="Ryujinx"
 						TextAlignment="Center" />
 					<TextBlock
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Margin="0,0,0,0"
 						FontSize="16"
 						Text="(REE-YOU-JINX)"
 						TextAlignment="Center" />
 					<Button
-                    Grid.Row="2"
-                    Grid.Column="1"
-                    Margin="0"
 						HorizontalAlignment="Center"
 						Background="Transparent"
 						Click="Button_OnClick"
@@ -89,31 +71,34 @@
 							TextDecorations="Underline"
 							ToolTip.Tip="{locale:Locale AboutUrlTooltipMessage}" />
 					</Button>
+				</flex:FlexPanel>
 			</Grid>
-			<TextBlock
+			<flex:FlexPanel
 				Grid.Row="1"
+				Direction="Column"
+				JustifyContent="FlexEnd"
+				RowSpacing="10"
+				AlignContent="Center"
+				HorizontalAlignment="Stretch"
+				VerticalAlignment="Stretch">
+				<TextBlock
 	                HorizontalAlignment="Center"
 	                VerticalAlignment="Center"
 	                Text="{Binding Version}"
 	                TextAlignment="Center" />
 				<TextBlock
-                Grid.Row="2"
-                Margin="20"
 	                HorizontalAlignment="Center"
 	                MaxLines="2"
 	                Text="{locale:Locale AboutDisclaimerMessage}"
 	                TextAlignment="Center" />
 				<TextBlock
 	                Name="AmiiboLabel"
-                Grid.Row="3"
-                Margin="20"
 	                HorizontalAlignment="Center"
 	                MaxLines="2"
 	                PointerPressed="AmiiboLabel_OnPointerPressed"
 	                Text="{locale:Locale AboutAmiiboDisclaimerMessage}"
 	                TextAlignment="Center" />
 				<StackPanel
-                Grid.Row="4"
 	                HorizontalAlignment="Center"
 	                Orientation="Horizontal"
 	                Spacing="10">
@@ -198,54 +183,44 @@
 						</Button>
 					</StackPanel>
 				</StackPanel>
+			</flex:FlexPanel>
 		</Grid>
 		<Border
             Grid.Row="1"
             Grid.Column="1"
-            Width="2"
+            Width="1"
-            Margin="5"
+            Margin="20 0"
             VerticalAlignment="Stretch"
-            BorderBrush="White"
+            BorderBrush="Black"
-            BorderThickness="1,0,0,0">
+            BorderThickness="1,0,0,0" />
-			<Separator Width="0" />
+		<flex:FlexPanel
-		</Border>
-		<Grid
 			Grid.Row="1"
             Grid.Column="2"
-            Margin="20"
+			AlignContent="SpaceEvenly"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Stretch">
-			<Grid.RowDefinitions>
+			<StackPanel
-				<RowDefinition Height="Auto" />
+				Spacing="10">
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" />
-			</Grid.RowDefinitions>
 				<TextBlock
 					FontWeight="Bold"
-                Text="{locale:Locale AboutRyujinxAboutTitle}"
+					FontSize="18"
-                TextDecorations="Underline" />
+					Text="{locale:Locale AboutRyujinxAboutTitle}" />
 				<TextBlock
-                Grid.Row="1"
-                Margin="20,5,5,5"
 					LineHeight="20"
+					TextWrapping="Wrap"
 					Text="{locale:Locale AboutRyujinxAboutContent}" />
+			</StackPanel>
+			<StackPanel
+				Spacing="10">
 				<TextBlock
-                Grid.Row="2"
-                Margin="0,10,0,0"
 					FontWeight="Bold"
-                Text="{locale:Locale AboutRyujinxMaintainersTitle}"
+					FontSize="18"
-                TextDecorations="Underline" />
+					Text="{locale:Locale AboutRyujinxMaintainersTitle}" />
 				<TextBlock
-                Grid.Row="3"
+					LineHeight="18"
-                Margin="20,5,5,5"
+					TextWrapping="Wrap"
-                LineHeight="20"
 					Text="{Binding Developers}" />
 				<Button
-                Grid.Row="4"
 					HorizontalAlignment="Right"
 					Background="Transparent"
 					Click="Button_OnClick"
@@ -253,30 +228,32 @@
 					<TextBlock
 						Text="{locale:Locale AboutRyujinxContributorsButtonHeader}"
 						TextAlignment="Right"
-                    TextDecorations="Underline"
 						ToolTip.Tip="{locale:Locale AboutRyujinxMaintainersContentTooltipMessage}" />
 				</Button>
+			</StackPanel>
+			<StackPanel
+				Spacing="10">
 				<TextBlock
-                Grid.Row="5"
-                Margin="0,0,0,0"
 					FontWeight="Bold"
-                Text="{locale:Locale AboutRyujinxSupprtersTitle}"
+					FontSize="18"
-                TextDecorations="Underline" />
+					Text="{locale:Locale AboutRyujinxSupprtersTitle}" />
 				<Border
-                Grid.Row="6"
-                Width="460"
-                Height="200"
-                Margin="20,5"
 					Padding="5"
 					VerticalAlignment="Stretch"
-                BorderBrush="White"
+					BorderBrush="Black"
-                BorderThickness="1">
+					BorderThickness="1"
+					CornerRadius="5">
 					<TextBlock
 						Name="SupportersTextBlock"
 						VerticalAlignment="Top"
-                    Text="{Binding Supporters}"
+						TextTrimming="CharacterEllipsis"
-                    TextWrapping="Wrap" />
+						FontSize="10"
+						MaxLines="10"
+						TextWrapping="Wrap"
+						LineHeight="12"
+						Text="{Binding Supporters}" />
 				</Border>
+			</StackPanel>
+		</flex:FlexPanel>
 	</Grid>
-	</Grid>
+</UserControl>
-</window:StyleableWindow>

Ryujinx.Ava/UI/Windows/AboutWindow.axaml.cs

@@ -1,25 +1,23 @@
-using Avalonia.Controls;
+using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
+using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Common.Utilities;
 using Ryujinx.Ui.Common.Helper;
 using System.Net.Http;
 using System.Net.NetworkInformation;
 using System.Threading.Tasks;
+using Button = Avalonia.Controls.Button;
 
 namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class AboutWindow : StyleableWindow
+    public partial class AboutWindow : UserControl
     {
         public AboutWindow()
         {
-            if (Program.PreviewerDetached)
-            {
-                Title = $"Ryujinx {Program.Version} - " + LocaleManager.Instance["MenuBarHelpAbout"];
-            }
-
             Version = Program.Version;
 
             DataContext = this;
@@ -34,6 +32,22 @@ namespace Ryujinx.Ava.UI.Windows
 
         public string Developers => string.Format(LocaleManager.Instance["AboutPageDeveloperListMore"], "gdkchan, Ac_K, Thog, rip in peri peri, LDj3SNuD, emmaus, Thealexbarney, Xpl0itR, GoffyDude, »jD«");
 
+        public static async Task Show()
+        {
+            var content = new AboutWindow();
+            ContentDialog contentDialog = new ContentDialog
+            {
+                Title = LocaleManager.Instance["MenuBarHelpAbout"],
+                PrimaryButtonText = "",
+                SecondaryButtonText = "",
+                CloseButtonText = LocaleManager.Instance["UserProfilesClose"],
+                Content = content,
+                Padding = new Thickness(0)
+            };
+
+            await contentDialog.ShowAsync();
+        }
+
         private void Button_OnClick(object sender, RoutedEventArgs e)
         {
             if (sender is Button button)