From 3b1885a15ea7b63249ebdd7789d584af8955c63a Mon Sep 17 00:00:00 2001
From: natsurainko <a-275@qq.com>
Date: Sun, 14 Jul 2024 23:15:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=91=E5=AF=BC=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20Java=20=E8=BF=90=E8=A1=8C=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BrowserMicrosoftAuthPage.xaml                    |  1 +
 .../Views/OOBE/AccountPage.xaml                      |  1 +
 Natsurainko.FluentLauncher/Views/OOBE/JavaPage.xaml  | 12 +++++-------
 .../Views/OOBE/MinecraftFolderPage.xaml              |  1 +
 .../Views/Settings/LaunchPage.xaml                   |  4 +++-
 .../XamlHelpers/Converters/JavaIconConverter.cs      |  2 +-
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Natsurainko.FluentLauncher/Views/AuthenticationWizard/BrowserMicrosoftAuthPage.xaml b/Natsurainko.FluentLauncher/Views/AuthenticationWizard/BrowserMicrosoftAuthPage.xaml
index d17b529e..8a2bc96c 100644
--- a/Natsurainko.FluentLauncher/Views/AuthenticationWizard/BrowserMicrosoftAuthPage.xaml
+++ b/Natsurainko.FluentLauncher/Views/AuthenticationWizard/BrowserMicrosoftAuthPage.xaml
@@ -15,6 +15,7 @@
         <Border CornerRadius="4">
             <WebView2
                 Height="300"
+                MinWidth="400"
                 HorizontalAlignment="Stretch"
                 Source="{Binding Source, Mode=TwoWay}">
                 <WebView2.Visibility>
diff --git a/Natsurainko.FluentLauncher/Views/OOBE/AccountPage.xaml b/Natsurainko.FluentLauncher/Views/OOBE/AccountPage.xaml
index 6764430e..8eb38b9a 100644
--- a/Natsurainko.FluentLauncher/Views/OOBE/AccountPage.xaml
+++ b/Natsurainko.FluentLauncher/Views/OOBE/AccountPage.xaml
@@ -63,6 +63,7 @@
         <Grid
             Grid.Column="2"
             Width="300"
+            MaxHeight="275"
             HorizontalAlignment="Center"
             VerticalAlignment="Center">
             <ListView
diff --git a/Natsurainko.FluentLauncher/Views/OOBE/JavaPage.xaml b/Natsurainko.FluentLauncher/Views/OOBE/JavaPage.xaml
index 86d11564..e674bd4a 100644
--- a/Natsurainko.FluentLauncher/Views/OOBE/JavaPage.xaml
+++ b/Natsurainko.FluentLauncher/Views/OOBE/JavaPage.xaml
@@ -77,6 +77,7 @@
         <Grid
             Grid.Column="2"
             Width="300"
+            MaxHeight="275"
             HorizontalAlignment="Center"
             VerticalAlignment="Center">
             <ListView ItemsSource="{Binding JavaRuntimes}" SelectedItem="{Binding ActiveJavaRuntime, Mode=TwoWay}">
@@ -90,13 +91,13 @@
                 <ListView.ItemTemplate>
                     <DataTemplate>
                         <Grid
-                            Padding="0,7.5"
+                            Padding="0,10"
                             Background="Transparent"
                             PointerEntered="Grid_PointerEntered"
                             PointerExited="Grid_PointerExited">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="7.5" />
+                                <ColumnDefinition Width="10" />
                                 <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
@@ -106,12 +107,9 @@
                                 Width="32"
                                 Height="32"
                                 VerticalAlignment="Center"
-                                Source="/Assets/Icons/java_logo.png" />
+                                Source="{Binding Converter={ThemeResource JavaIconConverter}}" />
                             <StackPanel Grid.Column="2">
-                                <TextBlock
-                                    FontWeight="SemiBold"
-                                    Text="{Binding Converter={ThemeResource JavaInfoConverter}}"
-                                    TextTrimming="CharacterEllipsis" />
+                                <TextBlock Text="{Binding Converter={ThemeResource JavaInfoConverter}}" TextTrimming="CharacterEllipsis" />
                                 <TextBlock
                                     Foreground="{ThemeResource ApplicationSecondaryForegroundThemeBrush}"
                                     Style="{ThemeResource CaptionTextBlockStyle}"
diff --git a/Natsurainko.FluentLauncher/Views/OOBE/MinecraftFolderPage.xaml b/Natsurainko.FluentLauncher/Views/OOBE/MinecraftFolderPage.xaml
index 592f06da..4cd72734 100644
--- a/Natsurainko.FluentLauncher/Views/OOBE/MinecraftFolderPage.xaml
+++ b/Natsurainko.FluentLauncher/Views/OOBE/MinecraftFolderPage.xaml
@@ -73,6 +73,7 @@
         <Grid
             Grid.Column="2"
             Width="300"
+            MaxHeight="275"
             HorizontalAlignment="Center"
             VerticalAlignment="Center">
             <ListView ItemsSource="{Binding MinecraftFolders}" SelectedItem="{Binding ActiveMinecraftFolder, Mode=TwoWay}">
diff --git a/Natsurainko.FluentLauncher/Views/Settings/LaunchPage.xaml b/Natsurainko.FluentLauncher/Views/Settings/LaunchPage.xaml
index 9eae6fb3..e3b546b2 100644
--- a/Natsurainko.FluentLauncher/Views/Settings/LaunchPage.xaml
+++ b/Natsurainko.FluentLauncher/Views/Settings/LaunchPage.xaml
@@ -151,10 +151,12 @@
                                 CommandParameter="{Binding}"
                                 Description="{Binding}"
                                 Header="{Binding Converter={ThemeResource JavaInfoConverter}}"
-                                HeaderIcon="{Binding Converter={ThemeResource JavaIconConverter}}"
                                 IsClickEnabled="True"
                                 Loaded="Card_Loaded"
                                 Tag="ActiveJava">
+                                <controls:SettingsCard.HeaderIcon>
+                                    <ImageIcon Source="{Binding Converter={ThemeResource JavaIconConverter}}" />
+                                </controls:SettingsCard.HeaderIcon>
                                 <StackPanel
                                     Name="Operations"
                                     Orientation="Horizontal"
diff --git a/Natsurainko.FluentLauncher/XamlHelpers/Converters/JavaIconConverter.cs b/Natsurainko.FluentLauncher/XamlHelpers/Converters/JavaIconConverter.cs
index ada784f6..bfd22bd9 100644
--- a/Natsurainko.FluentLauncher/XamlHelpers/Converters/JavaIconConverter.cs
+++ b/Natsurainko.FluentLauncher/XamlHelpers/Converters/JavaIconConverter.cs
@@ -20,7 +20,7 @@ public object Convert(object value, Type targetType, object parameter, string la
         var bitmapImage = new BitmapImage();
 
         _ = bitmapImage.SetSourceAsync(thumbnail);
-        return new ImageIcon() { Source = bitmapImage };
+        return bitmapImage;
     }
 
     public object ConvertBack(object value, Type targetType, object parameter, string language)