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

Merge pull request #551 from irihitech/various

Browse Source 
fix various issues.
This commit is contained in:
Dong Bin
2025-01-20 16:55:39 +08:00
committed by GitHub
parent 2822df9f0b 969661e121
commit f49b14a903
10 changed files with 45 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/Ursa.Demo/Views/TitleBarRightContent.axaml
View File

@@ -8,6 +8,8 @@
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Button <Button
Padding="8" Padding="8"
Width="32"
Height="32"
Theme="{DynamicResource BorderlessButton}" Theme="{DynamicResource BorderlessButton}"
Click="OpenRepository"> Click="OpenRepository">
<PathIcon <PathIcon

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>

2
src/Ursa.Themes.Semi/Controls/DialogShared.axaml
View File

@@ -9,7 +9,7 @@
</Design.PreviewWith> </Design.PreviewWith>
<ControlTheme x:Key="OverlayCloseButton" TargetType="Button"> <ControlTheme x:Key="OverlayCloseButton" TargetType="Button">
<Setter Property="CornerRadius" Value="6" /> <Setter Property="CornerRadius" Value="3" />
<Setter Property="Height" Value="24" /> <Setter Property="Height" Value="24" />
<Setter Property="Width" Value="24" /> <Setter Property="Width" Value="24" />
<Setter Property="Padding" Value="4" /> <Setter Property="Padding" Value="4" />

1
src/Ursa.Themes.Semi/Controls/DualBadge.axaml
View File

@@ -49,6 +49,7 @@
Name="{x:Static u:DualBadge.PART_ContentPresenter}" Name="{x:Static u:DualBadge.PART_ContentPresenter}"
Grid.Column="1" Grid.Column="1"
TextElement.FontSize="{TemplateBinding FontSize}" TextElement.FontSize="{TemplateBinding FontSize}"
IsVisible="{TemplateBinding Content,Converter={x:Static ObjectConverters.IsNotNull}}"
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"

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>

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

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}"

9
src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml
View File

@@ -2,14 +2,15 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:u="https://irihi.tech/ursa"> xmlns:u="https://irihi.tech/ursa">
<ControlTheme TargetType="u:ThemeToggleButton" x:Key="{x:Type u:ThemeToggleButton}"> <ControlTheme TargetType="u:ThemeToggleButton" x:Key="{x:Type u:ThemeToggleButton}">
<Setter Property="Padding" Value="8" />
<Setter Property="Width" Value="32" />
<Setter Property="Height" Value="32" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:ThemeToggleButton"> <ControlTemplate TargetType="u:ThemeToggleButton">
<Button <Button
Padding="8"
FontWeight="Regular"
Name="{x:Static u:ThemeToggleButton.PART_ThemeButton}" Name="{x:Static u:ThemeToggleButton.PART_ThemeButton}"
HorizontalAlignment="Center" Theme="{DynamicResource BorderlessButton}"
Theme="{DynamicResource BorderlessButton}"> Padding="{TemplateBinding Padding}">
<PathIcon <PathIcon
Name="PART_Icon" Name="PART_Icon"
Theme="{StaticResource InnerPathIcon}" Theme="{StaticResource InnerPathIcon}"

30
src/Ursa.Themes.Semi/Themes/Shared/NavigationMenu.axaml
View File

@@ -1,25 +1,23 @@
<ResourceDictionary <ResourceDictionary
xmlns="https://github.com/avaloniaui" xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:sys="clr-namespace:System;assembly=netstandard"> <StaticResource x:Key="NavigationMenuItemExpandIconGlyph" ResourceKey="SemiIconChevronDown" />
<Geometry x:Key="NavigationMenuExpandIconGlyph">M5 2H19C20.6569 2 22 3.34315 22 5V19C22 20.6569 20.6569 22 19 22H5C3.34315 22 2 20.6569 2 19V5C2 3.34315 3.34315 2 5 2ZM6 4C5.44772 4 5 4.44772 5 5V19C5 19.5523 5.44772 20 6 20H9C9.55229 20 10 19.5523 10 19V5C10 4.44772 9.55229 4 9 4H6Z</Geometry>
<Geometry x:Key="NavigationMenuItemExpandIconGlyph">M4.08045 7.59809C4.66624 7.01231 5.61599 7.01231 6.20177 7.59809L11.8586 13.2549L17.5155 7.59809C18.1013 7.01231 19.051 7.01231 19.6368 7.59809C20.2226 8.18388 20.2226 9.13363 19.6368 9.71941L12.9193 16.4369C12.3335 17.0227 11.3838 17.0227 10.798 16.4369L4.08045 9.71941C3.49467 9.13363 3.49467 8.18388 4.08045 7.59809Z</Geometry>
<sys:Double x:Key="NavigationMenuExpandWidth">260</sys:Double> <x:Double x:Key="NavigationMenuExpandWidth">260</x:Double>
<sys:Double x:Key="NavigationMenuClosedWidth">80</sys:Double> <x:Double x:Key="NavigationMenuClosedWidth">80</x:Double>
<sys:Double x:Key="NavigationMenuExpandIconWidth">16</sys:Double> <x:Double x:Key="NavigationMenuExpandIconWidth">16</x:Double>
<sys:Double x:Key="NavigationMenuExpandIconHeight">16</sys:Double> <x:Double x:Key="NavigationMenuExpandIconHeight">16</x:Double>
<sys:Double x:Key="NavigationMenuItemIconMinWidth">24</sys:Double> <x:Double x:Key="NavigationMenuItemIconMinWidth">24</x:Double>
<sys:Double x:Key="NavigationMenuItemExpandIconWidth">8</sys:Double> <x:Double x:Key="NavigationMenuItemExpandIconWidth">8</x:Double>
<sys:Double x:Key="NavigationMenuItemExpandIconHeight">8</sys:Double> <x:Double x:Key="NavigationMenuItemExpandIconHeight">8</x:Double>
<Thickness x:Key="NavigationMenuItemIconMargin">0</Thickness> <Thickness x:Key="NavigationMenuItemIconMargin">0</Thickness>
<sys:Double x:Key="NavigationMenuItemCollapsedHeight">0</sys:Double> <x:Double x:Key="NavigationMenuItemCollapsedHeight">0</x:Double>
<sys:Double x:Key="NavigationMenuItemCollapsedOpacity">0</sys:Double> <x:Double x:Key="NavigationMenuItemCollapsedOpacity">0</x:Double>
<sys:Double x:Key="NavigationMenuSeparatorHeaderFontSize">12</sys:Double> <x:Double x:Key="NavigationMenuSeparatorHeaderFontSize">12</x:Double>
<sys:Double x:Key="NavigationMenuSeparatorBorderHeight">1</sys:Double> <x:Double x:Key="NavigationMenuSeparatorBorderHeight">1</x:Double>
<sys:Double x:Key="NavigationMenuSeparatorClosedWidth">32</sys:Double> <x:Double x:Key="NavigationMenuSeparatorClosedWidth">32</x:Double>
<Thickness x:Key="NavigationMenuHeaderMargin">12</Thickness> <Thickness x:Key="NavigationMenuHeaderMargin">12</Thickness>