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

misc: using InnerPathIcon.

Browse Source
This commit is contained in:
Zhang Dian
2025-01-19 18:12:58 +08:00
parent 81b3635a2d
commit b5489062af
5 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Ursa.Themes.Semi/Controls/Calendar.axaml
View File

@@ -206,8 +206,8 @@
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
Theme="{DynamicResource BorderlessButton}"> Theme="{DynamicResource BorderlessButton}">
<PathIcon <PathIcon
Width="{DynamicResource CalenderViewPathIconWidth}" Theme="{StaticResource InnerPathIcon}"
Height="{DynamicResource CalenderViewPathIconHeight}" Classes="Large"
Data="{DynamicResource CalendarViewFastForwardGlyph}" Data="{DynamicResource CalendarViewFastForwardGlyph}"
Foreground="{DynamicResource CalendarItemIconForeground}" /> Foreground="{DynamicResource CalendarItemIconForeground}" />
</Button> </Button>
@@ -219,8 +219,8 @@
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
Theme="{DynamicResource BorderlessButton}"> Theme="{DynamicResource BorderlessButton}">
<PathIcon <PathIcon
Width="{DynamicResource CalenderViewPathIconWidth}" Theme="{StaticResource InnerPathIcon}"
Height="{DynamicResource CalenderViewPathIconHeight}" Classes="Large"
Data="{DynamicResource CalendarItemPreviousIconGlyph}" Data="{DynamicResource CalendarItemPreviousIconGlyph}"
Foreground="{DynamicResource CalendarItemIconForeground}" /> Foreground="{DynamicResource CalendarItemIconForeground}" />
</Button> </Button>
@@ -253,8 +253,8 @@
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
Theme="{DynamicResource BorderlessButton}"> Theme="{DynamicResource BorderlessButton}">
<PathIcon <PathIcon
Width="{DynamicResource CalenderViewPathIconWidth}" Theme="{StaticResource InnerPathIcon}"
Height="{DynamicResource CalenderViewPathIconHeight}" Classes="Large"
Data="{DynamicResource CalendarItemNextIconGlyph}" Data="{DynamicResource CalendarItemNextIconGlyph}"
Foreground="{DynamicResource CalendarItemIconForeground}" /> Foreground="{DynamicResource CalendarItemIconForeground}" />
</Button> </Button>
@@ -265,8 +265,8 @@
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
Theme="{DynamicResource BorderlessButton}"> Theme="{DynamicResource BorderlessButton}">
<PathIcon <PathIcon
Width="{DynamicResource CalenderViewPathIconWidth}" Theme="{StaticResource InnerPathIcon}"
Height="{DynamicResource CalenderViewPathIconHeight}" Classes="Large"
Data="{DynamicResource CalendarViewFastBackwardGlyph}" Data="{DynamicResource CalendarViewFastBackwardGlyph}"
Foreground="{DynamicResource CalendarItemIconForeground}" /> Foreground="{DynamicResource CalendarItemIconForeground}" />
</Button> </Button>

3
src/Ursa.Themes.Semi/Controls/NavMenu.axaml
View File

@@ -91,8 +91,7 @@
<PathIcon <PathIcon
Name="PART_ExpanderIcon" Name="PART_ExpanderIcon"
Grid.Column="2" Grid.Column="2"
Width="8" Theme="{StaticResource InnerPathIcon}"
Height="8"
Margin="12,0" Margin="12,0"
Data="{DynamicResource NavigationMenuItemExpandIconGlyph}" Data="{DynamicResource NavigationMenuItemExpandIconGlyph}"
Foreground="{DynamicResource NavigationMenuItemExpandIconForeground}"> Foreground="{DynamicResource NavigationMenuItemExpandIconForeground}">

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

@@ -14,16 +14,14 @@
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<u:PaginationButton Name="{x:Static u:Pagination.PART_PreviousButton}" u:DisabledAdorner.IsEnabled="True"> <u:PaginationButton Name="{x:Static u:Pagination.PART_PreviousButton}" u:DisabledAdorner.IsEnabled="True">
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
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 Name="{x:Static u:Pagination.PART_ButtonPanel}" Orientation="Horizontal" />
<u:PaginationButton Name="{x:Static u:Pagination.PART_NextButton}" u:DisabledAdorner.IsEnabled="True"> <u:PaginationButton Name="{x:Static u:Pagination.PART_NextButton}" u:DisabledAdorner.IsEnabled="True">
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12"
Data="{DynamicResource PaginationForwardGlyph}" Data="{DynamicResource PaginationForwardGlyph}"
Foreground="{DynamicResource PaginationButtonIconForeground}" /> Foreground="{DynamicResource PaginationButtonIconForeground}" />
</u:PaginationButton> </u:PaginationButton>
@@ -58,8 +56,7 @@
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<u:PaginationButton Name="{x:Static u:Pagination.PART_PreviousButton}" u:DisabledAdorner.IsEnabled="True"> <u:PaginationButton Name="{x:Static u:Pagination.PART_PreviousButton}" u:DisabledAdorner.IsEnabled="True">
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12"
Data="{DynamicResource PaginationBackwardGlyph}" Data="{DynamicResource PaginationBackwardGlyph}"
Foreground="{DynamicResource PaginationButtonIconForeground}" /> Foreground="{DynamicResource PaginationButtonIconForeground}" />
</u:PaginationButton> </u:PaginationButton>
@@ -92,8 +89,7 @@
</Grid> </Grid>
<u:PaginationButton Name="{x:Static u:Pagination.PART_NextButton}" u:DisabledAdorner.IsEnabled="True"> <u:PaginationButton Name="{x:Static u:Pagination.PART_NextButton}" u:DisabledAdorner.IsEnabled="True">
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12"
Data="{DynamicResource PaginationForwardGlyph}" Data="{DynamicResource PaginationForwardGlyph}"
Foreground="{DynamicResource PaginationButtonIconForeground}" /> Foreground="{DynamicResource PaginationButtonIconForeground}" />
</u:PaginationButton> </u:PaginationButton>
@@ -143,8 +139,7 @@
<Setter Property="Content"> <Setter Property="Content">
<Template> <Template>
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12"
Data="{DynamicResource PaginationMoreGlyph}" Data="{DynamicResource PaginationMoreGlyph}"
Foreground="{DynamicResource PaginationButtonIconForeground}" /> Foreground="{DynamicResource PaginationButtonIconForeground}" />
</Template> </Template>
@@ -153,8 +148,7 @@
<Setter Property="Content"> <Setter Property="Content">
<Template> <Template>
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12"
Data="{DynamicResource PaginationFastBackwardGlyph}" Data="{DynamicResource PaginationFastBackwardGlyph}"
Foreground="{DynamicResource PaginationButtonIconForeground}" /> Foreground="{DynamicResource PaginationButtonIconForeground}" />
</Template> </Template>
@@ -165,8 +159,7 @@
<Setter Property="Content"> <Setter Property="Content">
<Template> <Template>
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12"
Data="{DynamicResource PaginationMoreGlyph}" Data="{DynamicResource PaginationMoreGlyph}"
Foreground="{DynamicResource PaginationButtonIconForeground}" /> Foreground="{DynamicResource PaginationButtonIconForeground}" />
</Template> </Template>
@@ -175,8 +168,7 @@
<Setter Property="Content"> <Setter Property="Content">
<Template> <Template>
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12"
Data="{DynamicResource PaginationFastForwardGlyph}" Data="{DynamicResource PaginationFastForwardGlyph}"
Foreground="{DynamicResource PaginationButtonIconForeground}" /> Foreground="{DynamicResource PaginationButtonIconForeground}" />
</Template> </Template>

8
src/Ursa.Themes.Semi/Controls/ScrollToButton.axaml
View File

@@ -17,8 +17,7 @@
<PathIcon <PathIcon
Name="PART_Icon" Name="PART_Icon"
Margin="8" Margin="8"
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12"
Data="{DynamicResource ScrollToButtonIconGlyph}" Data="{DynamicResource ScrollToButtonIconGlyph}"
Foreground="{DynamicResource ButtonDefaultPrimaryForeground}" /> Foreground="{DynamicResource ButtonDefaultPrimaryForeground}" />
</Border> </Border>
@@ -61,8 +60,7 @@
<PathIcon <PathIcon
Name="PART_Icon" Name="PART_Icon"
Margin="8" Margin="8"
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12"
Data="{DynamicResource ScrollToButtonIconGlyph}" Data="{DynamicResource ScrollToButtonIconGlyph}"
Foreground="{DynamicResource ButtonSolidForeground}" /> Foreground="{DynamicResource ButtonSolidForeground}" />
</Border> </Border>
@@ -89,4 +87,4 @@
<Setter Property="RenderTransform" Value="rotate(270deg)" /> <Setter Property="RenderTransform" Value="rotate(270deg)" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

4
src/Ursa.Themes.Semi/Controls/TagInput.axaml
View File

@@ -124,8 +124,8 @@
<DockPanel LastChildFill="True"> <DockPanel LastChildFill="True">
<PathIcon <PathIcon
Name="{x:Static u:ClosableTag.PART_CloseButton}" Name="{x:Static u:ClosableTag.PART_CloseButton}"
Width="8" Theme="{StaticResource InnerPathIcon}"
Height="8" Classes="Small"
Margin="4,0" Margin="4,0"
Background="Transparent" Background="Transparent"
Data="{DynamicResource ClosableTagCloseIconGlyph}" Data="{DynamicResource ClosableTagCloseIconGlyph}"