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

fix QA padding margin align issues

Browse Source
This commit is contained in:
DismissedLight
2024-07-01 20:44:18 +08:00
parent 06cd462f01
commit bd5c244eeb
8 changed files with 93 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Layout/UniformStaggeredLayout.cs
View File

@@ -206,7 +206,11 @@ internal sealed partial class UniformStaggeredLayout : VirtualizingLayout
{
double itemHorizontalOffset = (state.ColumnWidth * columnIndex) + (MinColumnSpacing * columnIndex);
Rect bounds = new(itemHorizontalOffset, item.Top, state.ColumnWidth, item.Height);
double width = columnIndex == state.NumberOfColumns - 1
? finalSize.Width - itemHorizontalOffset
: state.ColumnWidth;
Rect bounds = new(itemHorizontalOffset, item.Top, width, item.Height);
UIElement element = context.GetOrCreateElementAt(item.Index);
element.Arrange(bounds);
}

1
src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Card/LaunchGameCard.xaml
View File

@@ -63,6 +63,7 @@
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageHomeLaunchGameSettingAction}"/>
<StackPanel
Grid.Row="2"
Grid.ColumnSpan="3"
VerticalAlignment="Bottom"
Spacing="8">
<TextBlock

4
src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/AnnouncementPage.xaml
View File

@@ -154,7 +154,7 @@
ItemsSource="{Binding List}">
<ItemsRepeater.Layout>
<UniformGridLayout
ItemsJustification="Start"
ItemsJustification="SpaceBetween"
ItemsStretch="Fill"
MinColumnSpacing="12"
MinItemWidth="300"
@@ -227,7 +227,7 @@
ItemsSource="{Binding Cards, Mode=OneWay}">
<ItemsRepeater.Layout>
<UniformGridLayout
ItemsJustification="Start"
ItemsJustification="SpaceBetween"
ItemsStretch="Fill"
MinColumnSpacing="12"
MinItemHeight="180"

10
src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/AvatarPropertyPage.xaml
View File

@@ -589,7 +589,7 @@
HorizontalAlignment="Left">
<!-- 卡片面板 -->
<Border Margin="16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
<Grid cw:UIElementExtensions.ClipToBounds="True" Style="{ThemeResource GridCardStyle}">
<Grid Style="{ThemeResource AcrylicGridCardStyle}">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition Height="auto"/>
@@ -601,6 +601,9 @@
<cwcont:ConstrainedBox
Grid.RowSpan="2"
Grid.ColumnSpan="2"
MinWidth="592"
MinHeight="282"
HorizontalAlignment="Center"
AspectRatio="840:400"
CornerRadius="{ThemeResource ControlCornerRadius}">
<shuxci:CachedImage
@@ -611,10 +614,11 @@
Source="{Binding SelectedAvatar.NameCard}"
Stretch="UniformToFill"/>
</cwcont:ConstrainedBox>
<Rectangle
<Border
Grid.RowSpan="2"
Grid.ColumnSpan="2"
Fill="#33000000"
Background="#33000000"
CornerRadius="{ThemeResource ControlCornerRadius}"
IsHitTestVisible="False"/>
<StackPanel
Margin="16"

39
src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/DailyNotePage.xaml
View File

@@ -479,7 +479,7 @@
<ToggleSwitch Margin="24,0,0,0" IsOn="{Binding DailyNoteOptions.IsAutoRefreshEnabled, Mode=TwoWay}"/>
</cwcont:SettingsCard>
<RadioButtons
Margin="1,11,0,5"
Margin="0,12,0,5"
IsEnabled="{Binding DailyNoteOptions.IsAutoRefreshEnabled}"
ItemsSource="{Binding DailyNoteOptions.RefreshTimes}"
SelectedItem="{Binding DailyNoteOptions.SelectedRefreshTime, Mode=TwoWay}">
@@ -540,27 +540,20 @@
</Border>
</Border>
<SplitView
x:Name="SettingPaneSplitView"
Grid.Row="1"
OpenPaneLength="480"
PaneBackground="{ThemeResource SystemControlAcrylicElementMediumHighBrush}"
PanePlacement="Right">
<ScrollView>
<ItemsRepeater
Margin="16"
ItemTemplate="{StaticResource DailyNoteEntryTemplate}"
ItemsSource="{Binding DailyNoteEntries}">
<ItemsRepeater.Layout>
<UniformGridLayout
ItemsJustification="Start"
ItemsStretch="Fill"
MinColumnSpacing="12"
MinItemWidth="300"
MinRowSpacing="12"/>
</ItemsRepeater.Layout>
</ItemsRepeater>
</ScrollView>
</SplitView>
<ScrollView Grid.Row="1">
<ItemsRepeater
Margin="16"
ItemTemplate="{StaticResource DailyNoteEntryTemplate}"
ItemsSource="{Binding DailyNoteEntries}">
<ItemsRepeater.Layout>
<UniformGridLayout
ItemsJustification="SpaceBetween"
ItemsStretch="Fill"
MinColumnSpacing="12"
MinItemWidth="300"
MinRowSpacing="12"/>
</ItemsRepeater.Layout>
</ItemsRepeater>
</ScrollView>
</Grid>
</shuxc:ScopedPage>

2
src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/GachaLogPage.xaml
View File

@@ -337,7 +337,7 @@
Margin="16"
HorizontalAlignment="Left"
cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
<Grid HorizontalAlignment="Center" Style="{StaticResource GridCardStyle}">
<Grid HorizontalAlignment="Center" Style="{StaticResource AcrylicGridCardStyle}">
<cwcont:ConstrainedBox AspectRatio="1080:533">
<shuxci:CachedImage
HorizontalAlignment="Center"

2
src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/WikiMonsterPage.xaml
View File

@@ -142,11 +142,13 @@
</Grid.ColumnDefinitions>
<StackPanel Padding="16" Spacing="16">
<TextBlock
Margin="1,0,0,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
Style="{StaticResource SubtitleTextBlockStyle}"
Text="{Binding Selected.Title}"/>
<shuxct:DescriptionTextBlock
Margin="1,0,0,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
Description="{Binding Selected.Description}"

113
src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/WikiWeaponPage.xaml
View File

@@ -255,66 +255,71 @@
Style="{StaticResource SubtitleTextBlockStyle}"
Text="{shuxm:ResourceString Name=ControlAutoSuggestBoxNotFoundValue}"/>
</StackPanel>
<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"/>
</Border.Background>
<cwc:ConstrainedBox AspectRatio="2048:1024">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Border Grid.ColumnSpan="2" Background="{ThemeResource DarkOnlyOverlayMaskColorBrush}"/>
<Grid Grid.ColumnSpan="2">
<ScrollViewer Visibility="{Binding Weapons.Count, Converter={StaticResource Int32ToVisibilityConverter}}">
<StackPanel Padding="16" Spacing="16">
<Border cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
<Border Style="{ThemeResource AcrylicBorderCardStyle}">
<Border.Background>
<ImageBrush ImageSource="ms-appx:///Resource/Icon/UI_GachaShowPanel_Bg_Weapon.png"/>
</Border.Background>
<cwc:ConstrainedBox AspectRatio="2048:1024">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="176*"/>
<ColumnDefinition Width="848*"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<shuxci:CachedImage
<Border Grid.ColumnSpan="2" Background="{ThemeResource DarkOnlyOverlayMaskColorBrush}"/>
<Grid Grid.ColumnSpan="2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="176*"/>
<ColumnDefinition Width="848*"/>
</Grid.ColumnDefinitions>
<shuxci:CachedImage
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Stretch"
Source="{Binding Selected.Icon, Converter={StaticResource GachaEquipIconConverter}}"/>
</Grid>
<ScrollViewer
Grid.Column="0"
Margin="16"
VerticalScrollBarVisibility="Hidden">
<StackPanel Spacing="16">
<shuxcc:VerticalCard MaxWidth="80">
<shuxcc:VerticalCard.Top>
<shuxc:ItemIcon Icon="{Binding Selected.Icon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/>
</shuxcc:VerticalCard.Top>
<shuxcc:VerticalCard.Bottom>
<TextBlock Text="{shuxm:ResourceString Name=ViewPageWiKiWeaponBeforeAscensionTitle}"/>
</shuxcc:VerticalCard.Bottom>
</shuxcc:VerticalCard>
<shuxcc:VerticalCard MaxWidth="80">
<shuxcc:VerticalCard.Top>
<shuxc:ItemIcon Icon="{Binding Selected.AwakenIcon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/>
</shuxcc:VerticalCard.Top>
<shuxcc:VerticalCard.Bottom>
<TextBlock Text="{shuxm:ResourceString Name=ViewPageWiKiWeaponAfterAscensionTitle}"/>
</shuxcc:VerticalCard.Bottom>
</shuxcc:VerticalCard>
</StackPanel>
</ScrollViewer>
<TextBlock
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Stretch"
Source="{Binding Selected.Icon, Converter={StaticResource GachaEquipIconConverter}}"/>
Margin="16"
HorizontalAlignment="Right"
VerticalAlignment="Bottom"
Style="{StaticResource SubtitleTextBlockStyle}"
Text="{Binding Selected.Name}"/>
</Grid>
<ScrollViewer
Grid.Column="0"
Margin="16"
VerticalScrollBarVisibility="Hidden">
<StackPanel Spacing="16">
<shuxcc:VerticalCard MaxWidth="80">
<shuxcc:VerticalCard.Top>
<shuxc:ItemIcon Icon="{Binding Selected.Icon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/>
</shuxcc:VerticalCard.Top>
<shuxcc:VerticalCard.Bottom>
<TextBlock Text="{shuxm:ResourceString Name=ViewPageWiKiWeaponBeforeAscensionTitle}"/>
</shuxcc:VerticalCard.Bottom>
</shuxcc:VerticalCard>
<shuxcc:VerticalCard MaxWidth="80">
<shuxcc:VerticalCard.Top>
<shuxc:ItemIcon Icon="{Binding Selected.AwakenIcon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/>
</shuxcc:VerticalCard.Top>
<shuxcc:VerticalCard.Bottom>
<TextBlock Text="{shuxm:ResourceString Name=ViewPageWiKiWeaponAfterAscensionTitle}"/>
</shuxcc:VerticalCard.Bottom>
</shuxcc:VerticalCard>
</StackPanel>
</ScrollViewer>
<TextBlock
Grid.Column="1"
Margin="16"
HorizontalAlignment="Right"
VerticalAlignment="Bottom"
Style="{StaticResource SubtitleTextBlockStyle}"
Text="{Binding Selected.Name}"/>
</Grid>
</cwc:ConstrainedBox>
</cwc:ConstrainedBox>
</Border>
</Border>
<TextBlock Text="{Binding Selected.Description}" TextWrapping="Wrap"/>
<TextBlock
Margin="1,0,0,0"
Text="{Binding Selected.Description}"
TextWrapping="Wrap"/>
<shuxvs:BaseValueSlider
HorizontalAlignment="Stretch"
HorizontalContentAlignment="Stretch"