[fix] 修复标题会和页面内容冲突的问题(#67)

zxbmmmmmmmmm · Sep 14, 2024 · 9e13887 · 9e13887
1 parent 95121c7
commit 9e13887
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/FluentWeather.Uwp/Pages/MainPage.xaml b/FluentWeather.Uwp/Pages/MainPage.xaml
@@ -66,7 +66,7 @@
                     Duration="0:0:0.8" />
             </animations:Implicit.ShowAnimations>
         </Border>
-        <!--每日详情-->
+        <!--每日详情-->       
         <local:DailyViewPage
             x:Name="DailyView"
             ui:VisualExtensions.NormalizedCenterPoint="0.5"
@@ -158,15 +158,15 @@
                 </core:EventTriggerBehavior>
                 <behaviors:SetParallaxViewSourceBehavior VerticalShift="64" />
             </i:Interaction.Behaviors>
-            <ScrollViewer
+            <ScrollViewer Margin="0,50,0,0"
                 x:Name="MainScrollViewer"
                 x:FieldModifier="Public"
                 Canvas.ZIndex="1"
                 VerticalScrollBarVisibility="Auto">
                 <Grid
                     x:Name="ContentGrid"
                     MaxWidth="1200"
-                    Padding="32,40,32,32">
+                    Padding="32,0,32,32">
                     <Grid.ChildrenTransitions>
                         <TransitionCollection>
                             <EntranceThemeTransition FromVerticalOffset="50" IsStaggeringEnabled="True" />
@@ -924,15 +924,28 @@
                         <Setter Target="DailyItemsView.ItemHeight" Value="150" />
                     </VisualState.Setters>
                 </VisualState>
+                <VisualState>
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="1400" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="TemperatureChart.Visibility" Value="Visible" />
+                        <Setter Target="DailyItemsView.Margin" Value="-32,0" />
+                        <Setter Target="DailyItemsView.ItemHeight" Value="150" />
+                        <Setter Target="MainScrollViewer.Margin" Value="0" />
+                        <Setter Target="WeatherNowGrid.Margin" Value="0,50,0,12" />
+                    </VisualState.Setters>
+                </VisualState>
                 <VisualState>
                     <VisualState.StateTriggers>
                         <AdaptiveTrigger MinWindowWidth="1600" />
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter Target="WeatherNowGrid.Margin" Value="0,40,0,12" />
+                        <Setter Target="WeatherNowGrid.Margin" Value="0,80,0,12" />
                         <Setter Target="TemperatureChart.Visibility" Value="Visible" />
                         <Setter Target="DailyItemsView.Margin" Value="-32,0" />
                         <Setter Target="DailyItemsView.ItemHeight" Value="150" />
+                        <Setter Target="MainScrollViewer.Margin" Value="0" />
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>