[fix]<AboutDialog> 修复部分UI错误

zxbmmmmmmmmm · Feb 25, 2024 · 14fe7d9 · 14fe7d9
1 parent db84d2e
commit 14fe7d9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/FluentWeather.Uwp/Controls/Dialogs/AboutDialog.xaml b/FluentWeather.Uwp/Controls/Dialogs/AboutDialog.xaml
@@ -14,13 +14,14 @@
     mc:Ignorable="d">
     <ContentDialog.Resources>
         <Thickness x:Key="ContentDialogPadding">0</Thickness>
+        <Thickness x:Key="ContentDialogSeparatorThickness">0</Thickness>
     </ContentDialog.Resources>
-    <Grid MaxHeight="380">
+    <Grid MaxHeight="360">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="9*" />
             <ColumnDefinition Width="16*" />
         </Grid.ColumnDefinitions>
-        <Image Source="/Assets/Backgrounds/Clear.png" Stretch="UniformToFill" />
+        <Image Source="/Assets/Backgrounds/Overcast.png" Stretch="UniformToFill" />
         <Grid Grid.Column="1" Padding="24">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -36,13 +37,15 @@
                 </TextBlock>
             </StackPanel>
             <StackPanel Grid.Row="1" Margin="0,12,0,0">
-                <TextBlock Text="Skyline是一款开源的天气应用，旨在取代网页套壳的自带天气应用，并提供更多实用功能" TextWrapping="Wrap" />
+                <TextBlock Text="Skyline是一款开源的天气应用。" TextWrapping="Wrap" />
+                <Grid Width="114514" />
                 <Grid
                     Margin="0,12,0,4"
                     Padding="12"
                     Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
                     BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                    BorderThickness="1">
+                    BorderThickness="1"
+                    CornerRadius="{ThemeResource ControlCornerRadius}">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition />
@@ -63,7 +66,7 @@
                         Grid.Row="1"
                         Margin="0,12,0,-4"
                         Orientation="Horizontal"
-                        Spacing="14">
+                        Spacing="{ThemeResource HyperlinkButtonSpacing}">
                         <HyperlinkButton>
                             <StackPanel Orientation="Horizontal" Spacing="6">
                                 <PathIcon VerticalAlignment="Center" Data="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z" />
@@ -83,12 +86,13 @@
                     Padding="12,4"
                     Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
                     BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                    BorderThickness="1">
-                    <StackPanel Orientation="Horizontal" Spacing="16">
+                    BorderThickness="1"
+                    CornerRadius="{ThemeResource ControlCornerRadius}">
+                    <StackPanel Orientation="Horizontal" Spacing="{ThemeResource HyperlinkButtonSpacing}">
                         <HyperlinkButton>
                             <StackPanel Orientation="Horizontal" Spacing="6">
                                 <PathIcon VerticalAlignment="Center" Data="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z" />
-                                <TextBlock Text="在GitHub上查看项目" />
+                                <TextBlock Text="项目地址" />
                             </StackPanel>
                         </HyperlinkButton>
                         <HyperlinkButton>

diff --git a/FluentWeather.Uwp/Themes/ClassicThemeStyles.xaml b/FluentWeather.Uwp/Themes/ClassicThemeStyles.xaml
@@ -29,6 +29,7 @@
     <Thickness x:Key="CityViewMargin">8,0</Thickness>
     <Thickness x:Key="ControlBorderThickness">1</Thickness>
     <x:Double x:Key="FontListFlyoutHeight">0</x:Double>
+    <x:Double x:Key="HyperlinkButtonSpacing">12</x:Double>
     <Thickness x:Key="ListItemMargin">0</Thickness>
     <Visibility x:Key="ListSelectedBorderVisibility">Visible</Visibility>
     <Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>

diff --git a/FluentWeather.Uwp/Themes/FluentV1ThemeStyles.xaml b/FluentWeather.Uwp/Themes/FluentV1ThemeStyles.xaml
@@ -19,6 +19,7 @@
     <CornerRadius x:Key="ControlCornerRadius">0</CornerRadius>
     <CornerRadius x:Key="OverlayCornerRadius">0</CornerRadius>
     <CornerRadius x:Key="ButtonControlCornerRadius">0</CornerRadius>
+    <x:Double x:Key="HyperlinkButtonSpacing">12</x:Double>
     <Thickness x:Key="TextControlBorderThemeThickness">0,0,0,1</Thickness>
     <Thickness x:Key="ListItemMargin">0</Thickness>
     <Thickness x:Key="ListViewItemRevealBorderThemeThickness">0</Thickness>

diff --git a/FluentWeather.Uwp/Themes/Generic.xaml b/FluentWeather.Uwp/Themes/Generic.xaml
@@ -41,6 +41,9 @@
 
     <Thickness x:Key="ContentDialogBorderWidth">1</Thickness>
 
+    <x:Double x:Key="HyperlinkButtonSpacing">0</x:Double>
+
+
     <x:Double x:Key="ContentDialogMinWidth">320</x:Double>
     <x:Double x:Key="ContentDialogMaxWidth">548</x:Double>
     <x:Double x:Key="ContentDialogMinHeight">184</x:Double>