Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix part of qa issues #1735

Merged
merged 2 commits into from
Jun 17, 2024
Merged

fix part of qa issues #1735

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
719d934
fix part of qa issues
qhy040404 Jun 16, 2024
409a223
fix inventory items wrong position
qhy040404 Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix inventory items wrong position
  • Loading branch information
@qhy040404
qhy040404 committed Jun 17, 2024
commit 409a2232131d84b9c86b1af61155688f4efa1d76
27 changes: 15 additions & 12 deletions src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@
<Grid>
<Pivot Style="{ThemeResource CardPivotStyle}" Visibility="{Binding CultivateEntries.Count, Converter={StaticResource Int32ToVisibilityConverter}}">
<PivotItem Header="{shcm:ResourceString Name=ViewPageCultivationCultivateEntry}">
<ScrollView Padding="0,0">
<ScrollViewer Padding="0,0">
<ItemsRepeater
Margin="16,16,16,0"
ItemTemplate="{StaticResource CultivateEntryTemplate}"
Expand All @@ -301,12 +301,12 @@
MinRowSpacing="-4"/>
</ItemsRepeater.Layout>
</ItemsRepeater>
</ScrollView>
</ScrollViewer>
</PivotItem>
<PivotItem Header="{shcm:ResourceString Name=ViewPageCultivationMaterialStatistics}">
<Border Margin="16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
<Border Style="{ThemeResource AcrylicBorderCardStyle}">
<ScrollView Padding="16,0">
<ScrollViewer Padding="16,0">
<ItemsRepeater
Margin="0,16,0,0"
ItemTemplate="{StaticResource StatisticsItemTemplate}"
Expand All @@ -320,7 +320,7 @@
MinRowSpacing="-4"/>
</ItemsRepeater.Layout>
</ItemsRepeater>
</ScrollView>
</ScrollViewer>
</Border>
</Border>

Expand Down Expand Up @@ -379,15 +379,18 @@
<PivotItem Header="{shcm:ResourceString Name=ViewPageCultivationInventoryItem}">
<Border Margin="16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
<Border Style="{ThemeResource AcrylicBorderCardStyle}">
<!-- Add a ScrollView for smooth scrolling -->
<ScrollView HorizontalScrollBarVisibility="Hidden">
<ItemsRepeater
Margin="16"
ItemTemplate="{StaticResource InventoryItemTemplate}"
ItemsSource="{Binding InventoryItems}">
<ItemsRepeater.Layout>
<shcl:WrapLayout HorizontalSpacing="12" VerticalSpacing="12"/>
</ItemsRepeater.Layout>
</ItemsRepeater>
<ScrollViewer HorizontalScrollBarVisibility="Disabled">
<ItemsRepeater
Margin="16"
ItemTemplate="{StaticResource InventoryItemTemplate}"
ItemsSource="{Binding InventoryItems}">
<ItemsRepeater.Layout>
<shcl:WrapLayout HorizontalSpacing="12" VerticalSpacing="12"/>
</ItemsRepeater.Layout>
</ItemsRepeater>
</ScrollViewer>
</ScrollView>
</Border>
</Border>
Expand Down