From 04c3498b54d447c93acaa103d4753272e160a86b Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Mon, 29 Apr 2024 23:53:08 +0800
Subject: [PATCH] fix wiki avatar/weapon margin

---
 .../Snap.Hutao/View/Page/WikiAvatarPage.xaml           | 10 ++++++----
 .../Snap.Hutao/View/Page/WikiWeaponPage.xaml           |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
index 5746598e..1fbb0552 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
@@ -362,10 +362,9 @@
                                             <shcb:SelectedItemInViewBehavior/>
                                         </mxi:Interaction.Behaviors>
                                     </ListView>
-
                                 </SplitView.Pane>
                                 <SplitView.Content>
-                                    <Grid Padding="16">
+                                    <Grid>
                                         <StackPanel VerticalAlignment="Center" Visibility="{Binding Avatars.Count, Converter={StaticResource Int32ToVisibilityRevertConverter}}">
                                             <shci:CachedImage
                                                 Height="120"
@@ -378,8 +377,11 @@
                                                 Style="{StaticResource SubtitleTextBlockStyle}"
                                                 Text="{shcm:ResourceString Name=ControlAutoSuggestBoxNotFoundValue}"/>
                                         </StackPanel>
-                                        <ScrollViewer Visibility="{Binding Avatars.Count, Converter={StaticResource Int32ToVisibilityConverter}}">
-                                            <StackPanel HorizontalAlignment="Left" Spacing="16">
+                                        <ScrollViewer Padding="16,0" Visibility="{Binding Avatars.Count, Converter={StaticResource Int32ToVisibilityConverter}}">
+                                            <StackPanel
+                                                Margin="0,16"
+                                                HorizontalAlignment="Left"
+                                                Spacing="16">
                                                 <!--  简介  -->
                                                 <Grid Style="{ThemeResource GridCardStyle}">
                                                     <Grid.RowDefinitions>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
index e480d002..9b149da8 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
@@ -233,7 +233,7 @@
                                     </ListView>
                                 </SplitView.Pane>
                                 <SplitView.Content>
-                                    <Grid Padding="16">
+                                    <Grid>
                                         <StackPanel VerticalAlignment="Center" Visibility="{Binding Weapons.Count, Converter={StaticResource Int32ToVisibilityRevertConverter}}">
                                             <shci:CachedImage
                                                 Height="120"
@@ -246,8 +246,8 @@
                                                 Style="{StaticResource SubtitleTextBlockStyle}"
                                                 Text="{shcm:ResourceString Name=ControlAutoSuggestBoxNotFoundValue}"/>
                                         </StackPanel>
-                                        <ScrollViewer Visibility="{Binding Weapons.Count, Converter={StaticResource Int32ToVisibilityConverter}}">
-                                            <StackPanel Spacing="16">
+                                        <ScrollViewer Padding="16,0" Visibility="{Binding Weapons.Count, Converter={StaticResource Int32ToVisibilityConverter}}">
+                                            <StackPanel Margin="0,16" Spacing="16">
                                                 <Border Style="{ThemeResource BorderCardStyle}">
                                                     <Border.Background>
                                                         <ImageBrush ImageSource="ms-appx:///Resource/Icon/UI_GachaShowPanel_Bg_Weapon.png"/>