From 917c173eb21f066441c6ddea39a5e8eabc21215a Mon Sep 17 00:00:00 2001
From: Lightczx <1686188646@qq.com>
Date: Tue, 30 Jan 2024 09:18:11 +0800
Subject: [PATCH] code style

---
 .../Control/Helper/ScrollViewerHelper.cs      |  1 -
 .../Control/Theme/ScrollViewer.xaml           |  2 +-
 .../Snap.Hutao/View/Page/SettingPage.xaml     | 35 +++++++++----------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Helper/ScrollViewerHelper.cs b/src/Snap.Hutao/Snap.Hutao/Control/Helper/ScrollViewerHelper.cs
index 11f0d0c7..b8cb9aff 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Helper/ScrollViewerHelper.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Helper/ScrollViewerHelper.cs
@@ -7,7 +7,6 @@ using Microsoft.UI.Xaml.Controls;
 namespace Snap.Hutao.Control.Helper;
 
 [SuppressMessage("", "SH001")]
-[DependencyProperty("LeftPanelMaxWidth", typeof(double), IsAttached = true, AttachedType = typeof(ScrollViewer))]
 [DependencyProperty("RightPanel", typeof(UIElement), IsAttached = true, AttachedType = typeof(ScrollViewer))]
 public sealed partial class ScrollViewerHelper
 {
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/ScrollViewer.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/ScrollViewer.xaml
index d0190712..0395733d 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/ScrollViewer.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/ScrollViewer.xaml
@@ -42,7 +42,7 @@
                                 Grid.ColumnSpan="2"
                                 Margin="{TemplateBinding Padding}">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" MaxWidth="{Binding Path=(shch:ScrollViewerHelper.LeftPanelMaxWidth), RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
+                                    <ColumnDefinition Width="*"/>
                                     <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
                                 <ScrollContentPresenter x:Name="ScrollContentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
index 39c0df99..85eab399 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
@@ -22,22 +22,7 @@
     </mxi:Interaction.Behaviors>
 
     <Grid x:Name="SettingPageGrid">
-
-        <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup>
-                <VisualState>
-                    <VisualState.StateTriggers>
-                        <cw:ControlSizeTrigger MinWidth="1000" TargetElement="{Binding ElementName=SettingPageGrid}"/>
-                    </VisualState.StateTriggers>
-                    <VisualState.Setters>
-                        <Setter Target="ScrollViwerRightPanel.Visibility" Value="Visible"/>
-                        <Setter Target="ScrollViwerTopPanel.Visibility" Value="Collapsed"/>
-                    </VisualState.Setters>
-                </VisualState>
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>
-
-        <ScrollViewer shch:ScrollViewerHelper.LeftPanelMaxWidth="1000" Style="{StaticResource TwoPanelScrollViewerStyle}">
+        <ScrollViewer Style="{StaticResource TwoPanelScrollViewerStyle}">
             <shch:ScrollViewerHelper.RightPanel>
                 <StackPanel
                     x:Name="ScrollViwerRightPanel"
@@ -129,7 +114,7 @@
 
                     <StackPanel
                         x:Name="ScrollViwerTopPanel"
-                        Margin="0,0,0,4"
+                        Margin="0,0,0,3"
                         Spacing="{StaticResource SettingsCardSpacing}"
                         Visibility="Visible">
                         <Border Margin="1,0,1,2" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
@@ -224,7 +209,7 @@
                         ItemsRepeater will behave abnormal if no direct scrollhost wrapping it
                     -->
                     <ScrollViewer
-                        Margin="0,-4,0,0"
+                        Margin="0,-3,0,0"
                         HorizontalScrollBarVisibility="Disabled"
                         VerticalScrollBarVisibility="Disabled">
                         <cwc:SettingsExpander
@@ -542,7 +527,19 @@
             </Grid>
         </ScrollViewer>
 
-
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup>
+                <VisualState>
+                    <VisualState.StateTriggers>
+                        <cw:ControlSizeTrigger MinWidth="1000" TargetElement="{Binding ElementName=SettingPageGrid}"/>
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="ScrollViwerRightPanel.Visibility" Value="Visible"/>
+                        <Setter Target="ScrollViwerTopPanel.Visibility" Value="Collapsed"/>
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
     </Grid>
 
 </shc:ScopedPage>
\ No newline at end of file