From e379fad5da00f34a39bc7e4fbf7de85fb00166d8 Mon Sep 17 00:00:00 2001
From: Evan Husted <greem@greemdev.net>
Date: Wed, 5 Mar 2025 15:56:43 -0600
Subject: [PATCH] UI: Custom title bar support for Amiibo window

---
 src/Ryujinx/UI/Windows/AmiiboWindow.axaml    | 22 +++++++++++++++++++-
 src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs |  7 ++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/Ryujinx/UI/Windows/AmiiboWindow.axaml b/src/Ryujinx/UI/Windows/AmiiboWindow.axaml
index ce410923d..8d2a8da44 100644
--- a/src/Ryujinx/UI/Windows/AmiiboWindow.axaml
+++ b/src/Ryujinx/UI/Windows/AmiiboWindow.axaml
@@ -23,7 +23,27 @@
         <viewModels:AmiiboWindowViewModel />
     </Design.DataContext>
     <Grid RowDefinitions="Auto,Auto,*,Auto" Margin="15" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" >
-        <Grid ColumnDefinitions="*,*" Grid.Row="1" HorizontalAlignment="Stretch" >
+        <Grid Name="FlushControls" ColumnDefinitions="Auto,Auto" Grid.Row="1" Margin="-15">
+            <Image 
+                Grid.Column="0"
+                Name="RyuLogo"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Margin="8, 8, 7, 0"
+                Height="25"
+                Width="25" />
+            <StackPanel Grid.Column="1" Orientation="Horizontal" Margin="0, 0, 0, 100">
+                <StackPanel Spacing="10" Orientation="Horizontal" HorizontalAlignment="Left">
+                    <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboSeriesLabel}" />
+                    <ComboBox Margin="0, 8, 0, 0" SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" />
+                </StackPanel>
+                <StackPanel Margin="15, 0, 0, 0" Spacing="10" Orientation="Horizontal" >
+                    <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboCharacterLabel}" />
+                    <ComboBox Margin="0, 8, 0, 0" SelectedIndex="{Binding AmiiboSelectedIndex}" MinWidth="100" ItemsSource="{Binding AmiiboList}" />
+                </StackPanel>
+            </StackPanel>
+        </Grid>
+        <Grid Name="NormalControls" ColumnDefinitions="*,*" Grid.Row="1" HorizontalAlignment="Stretch" >
             <StackPanel Spacing="10" Orientation="Horizontal" HorizontalAlignment="Left">
                 <TextBlock VerticalAlignment="Center" Text="{ext:Locale AmiiboSeriesLabel}" />
                 <ComboBox SelectedIndex="{Binding SeriesSelectedIndex}" ItemsSource="{Binding AmiiboSeries}" MinWidth="100" />
diff --git a/src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs b/src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs
index 8c76b8e2f..170cd6741 100644
--- a/src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/AmiiboWindow.axaml.cs
@@ -1,13 +1,14 @@
 using Avalonia.Interactivity;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models.Amiibo;
+using Ryujinx.Ava.Systems.Configuration;
 using Ryujinx.Ava.UI.ViewModels;
 
 namespace Ryujinx.Ava.UI.Windows
 {
     public partial class AmiiboWindow : StyleableAppWindow
     {
-        public AmiiboWindow(bool showAll, string lastScannedAmiiboId, string titleId)
+        public AmiiboWindow(bool showAll, string lastScannedAmiiboId, string titleId) : base(true, 40)
         {
             DataContext = ViewModel = new AmiiboWindowViewModel(this, lastScannedAmiiboId, titleId)
             {
@@ -16,6 +17,10 @@ namespace Ryujinx.Ava.UI.Windows
 
             InitializeComponent();
 
+            FlushControls.IsVisible = !ConfigurationState.Instance.ShowTitleBar;
+            NormalControls.IsVisible = ConfigurationState.Instance.ShowTitleBar;
+            RyuLogo.Source = MainWindowViewModel.IconBitmap;
+
             Title = RyujinxApp.FormatTitle(LocaleKeys.Amiibo);
         }