修复向导页面 Java 运行图标

Xcube-Studio · Jul 14, 2024 · 3b1885a · 3b1885a
1 parent 45b1e51
commit 3b1885a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)