细节修补

Xcube-Studio · Sep 14, 2024 · 9769b5f · 9769b5f
1 parent e81d058
commit 9769b5f
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 10 deletions.
diff --git a/Natsurainko.FluentLauncher/Views/Cores/Install/ChoosePage.xaml b/Natsurainko.FluentLauncher/Views/Cores/Install/ChoosePage.xaml
@@ -13,8 +13,7 @@
 
     <ScrollViewer>
         <Border Margin="0,10">
-            <StackPanel MaxWidth="1000" Spacing="4">
-
+            <StackPanel MaxWidth="1000" Spacing="{StaticResource SettingsCardSpacing}">
                 <StackPanel.ChildrenTransitions>
                     <EntranceThemeTransition FromVerticalOffset="50" />
                     <RepositionThemeTransition IsStaggeringEnabled="False" />

diff --git a/Natsurainko.FluentLauncher/Views/Cores/Install/ConfigPage.xaml b/Natsurainko.FluentLauncher/Views/Cores/Install/ConfigPage.xaml
@@ -14,7 +14,12 @@
 
     <ScrollViewer>
         <Border Margin="0,10">
-            <StackPanel MaxWidth="1000" Spacing="4">
+            <StackPanel MaxWidth="1000" Spacing="{StaticResource SettingsCardSpacing}">
+                <StackPanel.ChildrenTransitions>
+                    <EntranceThemeTransition FromVerticalOffset="50" />
+                    <RepositionThemeTransition IsStaggeringEnabled="False" />
+                </StackPanel.ChildrenTransitions>
+
                 <controls:SettingsCard HeaderIcon="{xh:FontIcon Glyph=&#xF158;}">
                     <controls:SettingsCard.Header>
                         <TextBlock x:Uid="CoreInstallWizard_EnterCoreSettingsPage_H1" Text="Core Absolute Id:" />

diff --git a/Natsurainko.FluentLauncher/Views/Cores/Install/OptionsPage.xaml b/Natsurainko.FluentLauncher/Views/Cores/Install/OptionsPage.xaml
@@ -15,10 +15,13 @@
         <converters:BoolToVisibilityConverter x:Key="InvertedBoolToVisibilityConverter" Inverted="True" />
     </Page.Resources>
 
-    <ScrollViewer VerticalScrollBarVisibility="Auto">
-        <!--  DO NOT remove this border. Directly setting the MaxWidth of ScrollViewer.Child causes layout issues.  -->
+    <ScrollViewer>
         <Border Margin="0,10">
-            <StackPanel MaxWidth="1000" Spacing="4">
+            <StackPanel MaxWidth="1000" Spacing="{StaticResource SettingsCardSpacing}">
+                <StackPanel.ChildrenTransitions>
+                    <EntranceThemeTransition FromVerticalOffset="50" />
+                    <RepositionThemeTransition IsStaggeringEnabled="False" />
+                </StackPanel.ChildrenTransitions>
 
                 <TextBlock
                     x:Uid="CoreInstallWizard_AdditionalOptionsPage_T1"

diff --git a/Natsurainko.FluentLauncher/Views/Cores/Manage/DefaultPage.xaml b/Natsurainko.FluentLauncher/Views/Cores/Manage/DefaultPage.xaml
@@ -15,6 +15,10 @@
                 MaxWidth="1000"
                 HorizontalAlignment="Stretch"
                 Spacing="{StaticResource SettingsCardSpacing}">
+                <StackPanel.ChildrenTransitions>
+                    <EntranceThemeTransition FromVerticalOffset="50" />
+                    <RepositionThemeTransition IsStaggeringEnabled="False" />
+                </StackPanel.ChildrenTransitions>
 
                 <TextBlock
                     x:Uid="Cores_Manage_DefaultPage_T1"
@@ -100,7 +104,8 @@
                     x:Uid="Cores_Manage_DefaultPage_Card1"
                     Description="Only as a display name, the actual Id will not be modified"
                     Header="Core Nickname"
-                    HeaderIcon="{xh:FontIcon Glyph=&#xE8AC;}">
+                    HeaderIcon="{xh:FontIcon Glyph=&#xE8AC;}"
+                    IsEnabled="False">
                     <TextBox Width="150" Text="{Binding InstanceConfig.NickName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                 </controls:SettingsCard>
 

diff --git a/Natsurainko.FluentLauncher/Views/Downloads/DefaultPage.xaml b/Natsurainko.FluentLauncher/Views/Downloads/DefaultPage.xaml
@@ -85,6 +85,10 @@
                 MaxWidth="1000"
                 HorizontalAlignment="Stretch"
                 Spacing="{StaticResource SettingsCardSpacing}">
+                <StackPanel.ChildrenTransitions>
+                    <EntranceThemeTransition FromVerticalOffset="50" />
+                    <RepositionThemeTransition IsStaggeringEnabled="False" />
+                </StackPanel.ChildrenTransitions>
 
                 <TextBlock
                     x:Uid="Downloads_DefaultPage_T1"

diff --git a/Natsurainko.FluentLauncher/Views/Downloads/DetailsPage.xaml b/Natsurainko.FluentLauncher/Views/Downloads/DetailsPage.xaml
@@ -8,7 +8,6 @@
     xmlns:core="using:Microsoft.Xaml.Interactions.Core"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:i="using:Microsoft.Xaml.Interactivity"
-    xmlns:labs="using:CommunityToolkit.Labs.WinUI.MarkdownTextBlock"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:old_controls="using:CommunityToolkit.WinUI.UI.Controls"
     Background="Transparent"
@@ -78,6 +77,11 @@
                 MaxWidth="1000"
                 HorizontalAlignment="Stretch"
                 Spacing="{StaticResource SettingsCardSpacing}">
+                <StackPanel.ChildrenTransitions>
+                    <EntranceThemeTransition FromVerticalOffset="50" />
+                    <RepositionThemeTransition IsStaggeringEnabled="False" />
+                </StackPanel.ChildrenTransitions>
+
                 <Border
                     Padding="16"
                     Background="{ThemeResource SettingsCardBackground}"

diff --git a/Natsurainko.FluentLauncher/Views/Downloads/SearchPage.xaml b/Natsurainko.FluentLauncher/Views/Downloads/SearchPage.xaml
@@ -223,6 +223,11 @@
                 MaxWidth="1000"
                 HorizontalAlignment="Stretch"
                 Spacing="{StaticResource SettingsCardSpacing}">
+                <StackPanel.ChildrenTransitions>
+                    <EntranceThemeTransition FromVerticalOffset="50" />
+                    <RepositionThemeTransition IsStaggeringEnabled="False" />
+                </StackPanel.ChildrenTransitions>
+
                 <TextBlock Style="{ThemeResource TitleTextBlockStyle}" Visibility="{Binding IsEmptySearchText, Converter={ThemeResource InvertedBoolToVisibilityConverter}}">
                     <Run Text="&quot;" /><Run Text="{Binding SearchText}" /><Run Text="&quot;" />
                 </TextBlock>

diff --git a/Natsurainko.FluentLauncher/Views/Tasks/DownloadPage.xaml b/Natsurainko.FluentLauncher/Views/Tasks/DownloadPage.xaml
@@ -36,8 +36,12 @@
                 Visibility="Collapsed" />
         </StackPanel>
 
-        <ScrollViewer Grid.Row="2" Padding="{ThemeResource PagePaddingWithScrollViewer}">
+        <ScrollViewer
+            Name="scrollViewer"
+            Grid.Row="2"
+            Padding="{ThemeResource PagePaddingWithScrollViewer}">
             <ItemsRepeater
+                Name="itemsRepeater"
                 MaxWidth="1000"
                 Margin="{ThemeResource PageEndMarginWithScrollViewer}"
                 ItemTemplate="{ThemeResource TemplateSelector}"
@@ -99,6 +103,8 @@
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
                         <Setter Target="stackPanel.Margin" Value="20, 10, 20, 20" />
+                        <Setter Target="scrollViewer.Padding" Value="20, 0" />
+                        <Setter Target="itemsRepeater.Margin" Value="0, 0, 0, 20" />
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>

diff --git a/Natsurainko.FluentLauncher/Views/Tasks/LaunchPage.xaml b/Natsurainko.FluentLauncher/Views/Tasks/LaunchPage.xaml
@@ -61,8 +61,12 @@
             </controls:WrapPanel>
         </StackPanel>
 
-        <ScrollViewer Grid.Row="2" Padding="{ThemeResource PagePaddingWithScrollViewer}">
+        <ScrollViewer
+            Name="scrollViewer"
+            Grid.Row="2"
+            Padding="{ThemeResource PagePaddingWithScrollViewer}">
             <ItemsRepeater
+                Name="itemsRepeater"
                 MaxWidth="1000"
                 Margin="{ThemeResource PageEndMarginWithScrollViewer}"
                 ItemTemplate="{ThemeResource TemplateSelector}"
@@ -124,6 +128,8 @@
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
                         <Setter Target="stackPanel.Margin" Value="20, 10, 20, 20" />
+                        <Setter Target="scrollViewer.Padding" Value="20, 0" />
+                        <Setter Target="itemsRepeater.Margin" Value="0, 0, 0, 20" />
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>