Fun/Snap.Hutao
1
0
Fork 0
mirror of https://jihulab.com/DGP-Studio/Snap.Hutao.git synced 2025-11-19 21:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

adjust ui for city banner

Browse Source
This commit is contained in:
DismissedLight
2024-03-12 21:34:42 +08:00
parent 51dfc7020f
commit 762bc14b88
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml
View File

@@ -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>

22
src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
View File

@@ -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