chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: add tiny theme.

Browse Source
This commit is contained in:
rabbitism
2024-08-10 00:42:06 +08:00
parent b0c86e91a1
commit d8740e540b
3 changed files with 84 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
demo/Ursa.Demo/Pages/PaginationDemo.axaml
View File

@@ -28,5 +28,8 @@
Command="{Binding LoadPageCommand}" Command="{Binding LoadPageCommand}"
CommandParameter="{Binding $self.CurrentPage}" CommandParameter="{Binding $self.CurrentPage}"
TotalCount="600" /> TotalCount="600" />
<TextBlock Text="Tiny Pagination"/>
<u:Pagination Theme="{DynamicResource TinyPagination}" TotalCount="100" PageSize="1"/>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

97
src/Ursa.Themes.Semi/Controls/Pagination.axaml
View File

@@ -8,31 +8,42 @@
</StackPanel> </StackPanel>
</Design.PreviewWith> </Design.PreviewWith>
<!-- Add Resources Here --> <!-- Add Resources Here -->
<ControlTheme x:Key="{x:Type u:Pagination}" TargetType="u:Pagination"> <ControlTheme x:Key="{x:Type u:Pagination}"
TargetType="u:Pagination">
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:Pagination"> <ControlTemplate TargetType="u:Pagination">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<u:PaginationButton u:DisabledAdorner.IsEnabled="True" Name="{x:Static u:Pagination.PART_PreviousButton}"> <u:PaginationButton
u:DisabledAdorner.IsEnabled="True"
Name="{x:Static u:Pagination.PART_PreviousButton}">
<PathIcon <PathIcon
Width="12" Width="12"
Height="12" Height="12"
Data="{DynamicResource PaginationBackwardGlyph}" Data="{DynamicResource PaginationBackwardGlyph}"
Foreground="{DynamicResource PaginationButtonIconForeground}" /> Foreground="{DynamicResource PaginationButtonIconForeground}" />
</u:PaginationButton> </u:PaginationButton>
<StackPanel Name="{x:Static u:Pagination.PART_ButtonPanel}" Orientation="Horizontal" /> <StackPanel
<u:PaginationButton u:DisabledAdorner.IsEnabled="True" Name="{x:Static u:Pagination.PART_NextButton}"> Name="{x:Static u:Pagination.PART_ButtonPanel}"
Orientation="Horizontal" />
<u:PaginationButton
u:DisabledAdorner.IsEnabled="True"
Name="{x:Static u:Pagination.PART_NextButton}">
<PathIcon <PathIcon
Width="12" Width="12"
Height="12" Height="12"
Data="{DynamicResource PaginationForwardGlyph}" Data="{DynamicResource PaginationForwardGlyph}"
Foreground="{DynamicResource PaginationButtonIconForeground}" /> Foreground="{DynamicResource PaginationButtonIconForeground}" />
</u:PaginationButton> </u:PaginationButton>
<StackPanel Orientation="Horizontal" IsVisible="{TemplateBinding ShowQuickJump}"> <StackPanel Orientation="Horizontal"
IsVisible="{TemplateBinding ShowQuickJump}">
<TextBlock <TextBlock
Margin="4 0" Margin="4 0"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{DynamicResource STRING_PAGINATION_JUMP_TO}" /> Text="{DynamicResource STRING_PAGINATION_JUMP_TO}" />
<u:NumericIntUpDown x:Name="{x:Static u:Pagination.PART_QuickJumpInput}" ShowButtonSpinner="False" Width="50"></u:NumericIntUpDown> <u:NumericIntUpDown
x:Name="{x:Static u:Pagination.PART_QuickJumpInput}"
ShowButtonSpinner="False"
Width="50" />
<TextBlock <TextBlock
Margin="4 0" Margin="4 0"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -48,16 +59,63 @@
</Setter> </Setter>
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="{x:Type u:PaginationButton}" TargetType="u:PaginationButton"> <ControlTheme x:Key="TinyPagination"
<Setter Property="Content" Value="{Binding $self.Page}" /> TargetType="{x:Type u:Pagination}">
<Setter Property="Template">
<ControlTemplate TargetType="u:Pagination">
<StackPanel Orientation="Horizontal">
<u:PaginationButton
u:DisabledAdorner.IsEnabled="True"
Name="{x:Static u:Pagination.PART_PreviousButton}">
<PathIcon
Width="12"
Height="12"
Data="{DynamicResource PaginationBackwardGlyph}"
Foreground="{DynamicResource PaginationButtonIconForeground}" />
</u:PaginationButton>
<StackPanel Orientation="Horizontal">
<u:NumericIntUpDown
Value="{TemplateBinding CurrentPage, Mode=TwoWay}"
ShowButtonSpinner="False"
HorizontalContentAlignment="Center"
MinWidth="{Binding $self.Bounds.Height}"
VerticalAlignment="Center" />
<TextBlock Text="/"
Margin="8 0"
VerticalAlignment="Center" />
<SelectableTextBlock
Text="{TemplateBinding PageCount}"
VerticalAlignment="Center" />
</StackPanel>
<u:PaginationButton
u:DisabledAdorner.IsEnabled="True"
Name="{x:Static u:Pagination.PART_NextButton}">
<PathIcon
Width="12"
Height="12"
Data="{DynamicResource PaginationForwardGlyph}"
Foreground="{DynamicResource PaginationButtonIconForeground}" />
</u:PaginationButton>
</StackPanel>
</ControlTemplate>
</Setter>
</ControlTheme>
<ControlTheme x:Key="{x:Type u:PaginationButton}"
TargetType="u:PaginationButton">
<Setter Property="Content"
Value="{Binding $self.Page}" />
<Setter Property="BorderBrush" Value="Transparent" /> <Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="MinWidth" Value="32" /> <Setter Property="MinWidth" Value="32" />
<Setter Property="MinHeight" Value="32" /> <Setter Property="MinHeight" Value="32" />
<Setter Property="Background" Value="{DynamicResource PaginationButtonDefaultBackground}" /> <Setter Property="Background"
<Setter Property="Foreground" Value="{DynamicResource PaginationButtonDefaultForeground}" /> Value="{DynamicResource PaginationButtonDefaultBackground}" />
<Setter Property="Foreground"
Value="{DynamicResource PaginationButtonDefaultForeground}" />
<Setter Property="Cursor" Value="Hand" /> <Setter Property="Cursor" Value="Hand" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:PaginationButton"> <ControlTemplate
TargetType="u:PaginationButton">
<Border <Border
Padding="4" Padding="4"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
@@ -74,10 +132,12 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:pointerover"> <Style Selector="^:pointerover">
<Setter Property="Background" Value="{DynamicResource PaginationButtonPointeroverBackground}" /> <Setter Property="Background"
Value="{DynamicResource PaginationButtonPointeroverBackground}" />
</Style> </Style>
<Style Selector="^:pressed"> <Style Selector="^:pressed">
<Setter Property="Background" Value="{DynamicResource PaginationButtonPressedBackground}" /> <Setter Property="Background"
Value="{DynamicResource PaginationButtonPressedBackground}" />
</Style> </Style>
<Style Selector="^:left"> <Style Selector="^:left">
<Setter Property="Content"> <Setter Property="Content">
@@ -124,10 +184,13 @@
</Style> </Style>
</Style> </Style>
<Style Selector="^:selected"> <Style Selector="^:selected">
<Setter Property="Background" Value="{DynamicResource PaginationButtonSelectedBackground}" /> <Setter Property="Background"
<Setter Property="Foreground" Value="{DynamicResource PaginationButtonSelectedForeground}" /> Value="{DynamicResource PaginationButtonSelectedBackground}" />
<Setter Property="FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" /> <Setter Property="Foreground"
Value="{DynamicResource PaginationButtonSelectedForeground}" />
<Setter Property="FontWeight"
Value="{DynamicResource TextBlockTitleFontWeight}" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

2
src/Ursa/Controls/Pagination/Pagination.cs
View File

@@ -46,7 +46,7 @@ public class Pagination: TemplatedControl
if (arg2 is null) return null; if (arg2 is null) return null;
if (arg1 is Pagination p) if (arg1 is Pagination p)
{ {
arg2 = MathHelpers.SafeClamp(arg2.Value, 1, p.PageCount + 1); arg2 = MathHelpers.SafeClamp(arg2.Value, 1, p.PageCount);
} }
return arg2; return arg2;
} }