From 762bc14b88d1140d6dd3cafca68705f3e6626a92 Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Tue, 12 Mar 2024 21:34:42 +0800
Subject: [PATCH] adjust ui for city banner

---
 .../Control/Theme/ItemsPanelTemplate.xaml     |  3 +++
 .../Snap.Hutao/View/Page/GachaLogPage.xaml    | 22 ++++++-------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml
index 55879c4e..c0b6173c 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml
@@ -8,6 +8,9 @@
     <ItemsPanelTemplate x:Key="WrapPanelSpacing0Template">
         <cwcont:WrapPanel/>
     </ItemsPanelTemplate>
+    <ItemsPanelTemplate x:Key="WrapPanelSpacing2Template">
+        <cwcont:WrapPanel HorizontalSpacing="2" VerticalSpacing="2"/>
+    </ItemsPanelTemplate>
     <ItemsPanelTemplate x:Key="WrapPanelSpacing4Template">
         <cwcont:WrapPanel HorizontalSpacing="4" VerticalSpacing="4"/>
     </ItemsPanelTemplate>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
index e5e32a10..85648272 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
@@ -143,8 +143,8 @@
             <Border Width="40" Style="{StaticResource BorderCardStyle}">
                 <StackPanel>
                     <shvc:ItemIcon
-                        Width="40"
-                        Height="40"
+                        Width="38"
+                        Height="38"
                         Icon="{Binding Icon}"
                         Quality="{Binding Quality}"/>
                     <TextBlock
@@ -183,17 +183,19 @@
                     Text="{Binding TotalCountFormatted}"/>
                 <ItemsControl
                     Grid.Row="1"
+                    MaxWidth="124"
                     Margin="0,6,0,0"
                     HorizontalAlignment="Left"
                     ItemTemplate="{StaticResource HistoryWishItemTemplate}"
-                    ItemsPanel="{StaticResource HorizontalStackPanelSpacing2Template}"
+                    ItemsPanel="{StaticResource WrapPanelSpacing2Template}"
                     ItemsSource="{Binding OrangeUpList}"/>
                 <ItemsControl
                     Grid.Row="1"
+                    MaxWidth="252"
                     Margin="0,6,0,0"
                     HorizontalAlignment="Right"
                     ItemTemplate="{StaticResource HistoryWishItemTemplate}"
-                    ItemsPanel="{StaticResource HorizontalStackPanelSpacing2Template}"
+                    ItemsPanel="{StaticResource WrapPanelSpacing2Template}"
                     ItemsSource="{Binding PurpleUpList}"/>
                 <TextBlock
                     Grid.Row="2"
@@ -300,17 +302,7 @@
                             <shvc:StatisticsCard DataContext="{Binding Statistics.StandardWish}" ShowUpPull="False"/>
                             <shvc:StatisticsCard DataContext="{Binding Statistics.ChronicledWish}" ShowUpPull="False"/>
                         </shcp:HorizontalEqualPanel>
-                        <!--<Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" MinWidth="240"/>
-                                <ColumnDefinition Width="*" MinWidth="240"/>
-                                <ColumnDefinition Width="*" MinWidth="240"/>
-                                <ColumnDefinition Width="*" MinWidth="240"/>
-                            </Grid.ColumnDefinitions>
-
-                        </Grid>-->
                     </ScrollViewer>
-
                 </PivotItem>
                 <PivotItem Header="{shcm:ResourceString Name=ViewPageGahcaLogPivotHistory}">
                     <Border Margin="16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
@@ -318,7 +310,7 @@
                             <SplitView
                                 DisplayMode="Inline"
                                 IsPaneOpen="True"
-                                OpenPaneLength="323"
+                                OpenPaneLength="408"
                                 PaneBackground="{ThemeResource CardBackgroundFillColorSecondaryBrush}">
                                 <SplitView.Pane>
                                     <ListView