initial Layout

src/Ryujinx.Ava/Assets/Locales/en_US.json

@@ -594,7 +594,7 @@
   "DlcWindowTitle": "Manage Downloadable Content for {0} ({1})",
   "UpdateWindowTitle": "Title Update Manager",
   "CheatWindowHeading": "Manage Cheats for {0} ({1})",
-  "BuildId": "BuildId:",
+  "BuildId": "Build ID:",
   "DlcWindowHeading": "{0} Downloadable Content(s)",
   "UserProfilesEditProfile": "Edit Selected",
   "Cancel": "Cancel",

src/Ryujinx.Ava/UI/ViewModels/CheatWindowViewModel.cs

@@ -1,4 +1,6 @@
+using Avalonia;
 using Avalonia.Collections;
+using Avalonia.Controls.ApplicationLifetimes;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
@@ -59,6 +61,14 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        public async void CopyToClipboard()
+        {
+            if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            {
+                await desktop.MainWindow.Clipboard.SetTextAsync(BuildId);
+            }
+        }
+
         public void Save()
         {
             List<string> enabledCheats = new();

src/Ryujinx.Ava/UI/Windows/CheatWindow.axaml

@@ -11,50 +11,53 @@
     x:DataType="viewModels:CheatWindowViewModel"
     mc:Ignorable="d"
     Focusable="True">
-    <Grid Name="CheatGrid" Margin="15">
+    <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
+        <Panel
-            <ColumnDefinition Width="*" />
+            Margin="0 0 0 10"
-            <ColumnDefinition Width="*" />
+            Grid.Row="0">
-        </Grid.ColumnDefinitions>
+            <Grid>
-        <TextBlock
+                <Grid.ColumnDefinitions>
-            Grid.Row="2"
+                    <ColumnDefinition Width="Auto" />
-            Grid.Column="0"
+                    <ColumnDefinition Width="*" />
-            MaxWidth="500"
+                </Grid.ColumnDefinitions>
-            Margin="140,15,20,5"
+                <StackPanel
-            HorizontalAlignment="Center"
+                    Orientation="Horizontal"
-            VerticalAlignment="Center"
+                    Grid.Column="0">
-            LineHeight="30"
+                    <TextBlock
-            Text="{locale:Locale BuildId}"
+                        Padding="0 0 10 0"
-            TextAlignment="Center"
+                        Text="{locale:Locale BuildId}" />
-            TextWrapping="Wrap" />
+                    <Button
-        <TextBox
+                        Name="CopyButton"
-            Grid.Row="2"
+                        Command="{Binding CopyToClipboard}">
-            Grid.Column="1"
+                        <TextBlock Text="{Binding BuildId}" />
-            Margin="0,5,110,5"
+                    </Button>
-            MinWidth="160"
+                </StackPanel>
-            HorizontalAlignment="Center"
+                <TextBox
-            VerticalAlignment="Center"
+                    Grid.Column="1"
-            Text="{Binding BuildId}"
+                    MinHeight="29"
-            IsReadOnly="True" />
+                    MaxHeight="29"
+                    HorizontalAlignment="Stretch"
+                    Watermark="{locale:Locale Search}"
+                    Text="{Binding}" />
+            </Grid>
+        </Panel>
         <Border
-            Grid.Row="3"
+            Grid.Row="1"
-            Grid.Column="0"
+            Margin="0 0 0 24"
-            Grid.ColumnSpan="2"
-            Margin="5"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Stretch"
-            BorderBrush="Gray"
+            BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
-            BorderThickness="1">
+            BorderThickness="1"
+            CornerRadius="5"
+            Padding="2.5">
             <TreeView
                 Name="CheatsView"
-                MinHeight="300"
+                SelectionMode="Multiple, Toggle"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch"
                 ItemsSource="{Binding LoadedCheats}">
@@ -77,13 +80,32 @@
                 </TreeView.ItemTemplate>
             </TreeView>
         </Border>
-        <DockPanel
+        <Panel
-            Grid.Row="4"
+            Grid.Row="2"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
-            Margin="0"
             HorizontalAlignment="Stretch">
-            <DockPanel Margin="0" HorizontalAlignment="Right">
+            <StackPanel
+                Orientation="Horizontal"
+                Spacing="10"
+                HorizontalAlignment="Left">
+                <Button
+                    Name="AddButton"
+                    MinWidth="90"
+                    Margin="5"
+                    Command="{Binding}">
+                    <TextBlock Text="{locale:Locale SettingsTabGeneralAdd}" />
+                </Button>
+                <Button
+                    Name="RemoveAllButton"
+                    MinWidth="90"
+                    Margin="5"
+                    Command="{Binding}">
+                    <TextBlock Text="{locale:Locale DlcManagerRemoveAllButton}" />
+                </Button>
+            </StackPanel>
+            <StackPanel
+                Orientation="Horizontal"
+                Spacing="10"
+                HorizontalAlignment="Right">
                 <Button
                     Name="SaveButton"
                     MinWidth="90"
@@ -98,7 +120,7 @@
                     Click="Close">
                     <TextBlock Text="{locale:Locale InputDialogCancel}" />
                 </Button>
-            </DockPanel>
+            </StackPanel>
-        </DockPanel>
+        </Panel>
     </Grid>
 </UserControl>