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

feat: unified icon size.

Browse Source
This commit is contained in:
Zhang Dian
2025-01-08 22:47:15 +08:00
parent fa37a0763a
commit 2914077d6b
4 changed files with 28 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/Ursa.Themes.Semi/Controls/Dialog.axaml
View File

@@ -76,9 +76,8 @@
<MenuItem Command="{Binding $parent[u:DialogControlBase].Close}" Header="{DynamicResource STRING_MENU_DIALOG_CLOSE}"> <MenuItem Command="{Binding $parent[u:DialogControlBase].Close}" Header="{DynamicResource STRING_MENU_DIALOG_CLOSE}">
<MenuItem.Icon> <MenuItem.Icon>
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12" Data="{DynamicResource SemiIconClose}" />
Data="{DynamicResource WindowCloseIconGlyph}" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
</MenuFlyout> </MenuFlyout>
@@ -93,8 +92,7 @@
Header="{DynamicResource STRING_MENU_BRING_FORWARD}"> Header="{DynamicResource STRING_MENU_BRING_FORWARD}">
<MenuItem.Icon> <MenuItem.Icon>
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12"
Data="{DynamicResource DialogArrangeBringForwardGlyph}" /> Data="{DynamicResource DialogArrangeBringForwardGlyph}" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
@@ -104,8 +102,7 @@
Header="{DynamicResource STRING_MENU_BRING_TO_FRONT}"> Header="{DynamicResource STRING_MENU_BRING_TO_FRONT}">
<MenuItem.Icon> <MenuItem.Icon>
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12"
Data="{DynamicResource DialogArrangeBringToFrontGlyph}" /> Data="{DynamicResource DialogArrangeBringToFrontGlyph}" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
@@ -115,8 +112,7 @@
Header="{DynamicResource STRING_MENU_SEND_BACKWARD}"> Header="{DynamicResource STRING_MENU_SEND_BACKWARD}">
<MenuItem.Icon> <MenuItem.Icon>
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12"
Data="{DynamicResource DialogArrangeSendBackwardGlyph}" /> Data="{DynamicResource DialogArrangeSendBackwardGlyph}" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
@@ -126,17 +122,15 @@
Header="{DynamicResource STRING_MENU_SEND_TO_BACK}"> Header="{DynamicResource STRING_MENU_SEND_TO_BACK}">
<MenuItem.Icon> <MenuItem.Icon>
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12"
Data="{DynamicResource DialogArrangeSendToBackGlyph}" /> Data="{DynamicResource DialogArrangeSendToBackGlyph}" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
<MenuItem Command="{Binding $parent[u:DialogControlBase].Close}" Header="{DynamicResource STRING_MENU_DIALOG_CLOSE}"> <MenuItem Command="{Binding $parent[u:DialogControlBase].Close}" Header="{DynamicResource STRING_MENU_DIALOG_CLOSE}">
<MenuItem.Icon> <MenuItem.Icon>
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12" Data="{DynamicResource SemiIconClose}" />
Data="{DynamicResource WindowCloseIconGlyph}" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
</MenuFlyout> </MenuFlyout>
@@ -186,8 +180,8 @@
<PathIcon <PathIcon
Name="PART_Icon" Name="PART_Icon"
Grid.Column="0" Grid.Column="0"
Width="16" Theme="{StaticResource InnerPathIcon}"
Height="16" Classes="ExtraLarge"
Margin="24,24,8,0" Margin="24,24,8,0"
VerticalAlignment="Center" /> VerticalAlignment="Center" />
<TextBlock <TextBlock
@@ -392,9 +386,8 @@
<MenuItem Command="{Binding $parent[u:DialogControlBase].Close}" Header="{DynamicResource STRING_MENU_DIALOG_CLOSE}"> <MenuItem Command="{Binding $parent[u:DialogControlBase].Close}" Header="{DynamicResource STRING_MENU_DIALOG_CLOSE}">
<MenuItem.Icon> <MenuItem.Icon>
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12" Data="{DynamicResource SemiIconClose}" />
Data="{DynamicResource WindowCloseIconGlyph}" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
</MenuFlyout> </MenuFlyout>
@@ -409,8 +402,7 @@
Header="{DynamicResource STRING_MENU_BRING_FORWARD}"> Header="{DynamicResource STRING_MENU_BRING_FORWARD}">
<MenuItem.Icon> <MenuItem.Icon>
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12"
Data="{DynamicResource DialogArrangeBringForwardGlyph}" /> Data="{DynamicResource DialogArrangeBringForwardGlyph}" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
@@ -420,8 +412,7 @@
Header="{DynamicResource STRING_MENU_BRING_TO_FRONT}"> Header="{DynamicResource STRING_MENU_BRING_TO_FRONT}">
<MenuItem.Icon> <MenuItem.Icon>
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12"
Data="{DynamicResource DialogArrangeBringToFrontGlyph}" /> Data="{DynamicResource DialogArrangeBringToFrontGlyph}" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
@@ -431,8 +422,7 @@
Header="{DynamicResource STRING_MENU_SEND_BACKWARD}"> Header="{DynamicResource STRING_MENU_SEND_BACKWARD}">
<MenuItem.Icon> <MenuItem.Icon>
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12"
Data="{DynamicResource DialogArrangeSendBackwardGlyph}" /> Data="{DynamicResource DialogArrangeSendBackwardGlyph}" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
@@ -442,8 +432,7 @@
Header="{DynamicResource STRING_MENU_SEND_TO_BACK}"> Header="{DynamicResource STRING_MENU_SEND_TO_BACK}">
<MenuItem.Icon> <MenuItem.Icon>
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12"
Data="{DynamicResource DialogArrangeSendToBackGlyph}" /> Data="{DynamicResource DialogArrangeSendToBackGlyph}" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
@@ -453,9 +442,8 @@
Header="{DynamicResource STRING_MENU_DIALOG_CLOSE}"> Header="{DynamicResource STRING_MENU_DIALOG_CLOSE}">
<MenuItem.Icon> <MenuItem.Icon>
<PathIcon <PathIcon
Width="12" Theme="{StaticResource InnerPathIcon}"
Height="12" Data="{DynamicResource SemiIconClose}" />
Data="{DynamicResource WindowCloseIconGlyph}" />
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
</MenuFlyout> </MenuFlyout>
@@ -588,8 +576,8 @@
<PathIcon <PathIcon
Name="PART_Icon" Name="PART_Icon"
Grid.Column="0" Grid.Column="0"
Width="16" Theme="{StaticResource InnerPathIcon}"
Height="16" Classes="ExtraLarge"
Margin="24,24,8,0" Margin="24,24,8,0"
VerticalAlignment="Center" /> VerticalAlignment="Center" />
<TextBlock <TextBlock

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

@@ -47,8 +47,8 @@
<PathIcon <PathIcon
Name="PART_Icon" Name="PART_Icon"
Grid.Column="0" Grid.Column="0"
Width="24" Theme="{StaticResource InnerPathIcon}"
Height="24" Classes="ExtraLarge"
Margin="0,0,8,0" Margin="0,0,8,0"
VerticalAlignment="Center" VerticalAlignment="Center"
IsHitTestVisible="False" /> IsHitTestVisible="False" />
@@ -193,8 +193,8 @@
<PathIcon <PathIcon
Name="PART_Icon" Name="PART_Icon"
Grid.Column="0" Grid.Column="0"
Width="24" Theme="{StaticResource InnerPathIcon}"
Height="24" Classes="ExtraLarge"
Margin="24,24,8,0" Margin="24,24,8,0"
VerticalAlignment="Center" VerticalAlignment="Center"
IsHitTestVisible="False" /> IsHitTestVisible="False" />

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

@@ -84,8 +84,8 @@
<DockPanel MinWidth="{DynamicResource NotificationCardMinWidth}"> <DockPanel MinWidth="{DynamicResource NotificationCardMinWidth}">
<PathIcon <PathIcon
x:Name="NotificationIcon" x:Name="NotificationIcon"
Width="{DynamicResource NotificationCardIconWidth}" Theme="{StaticResource InnerPathIcon}"
Height="{DynamicResource NotificationCardIconHeight}" Classes="Large"
Margin="{DynamicResource NotificationCardIconMargin}" Margin="{DynamicResource NotificationCardIconMargin}"
VerticalAlignment="Top" VerticalAlignment="Top"
IsVisible="{TemplateBinding ShowIcon}" IsVisible="{TemplateBinding ShowIcon}"

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

@@ -56,8 +56,8 @@
<DockPanel> <DockPanel>
<PathIcon <PathIcon
x:Name="ToastIcon" x:Name="ToastIcon"
Width="{DynamicResource ToastCardIconWidth}" Theme="{StaticResource InnerPathIcon}"
Height="{DynamicResource ToastCardIconHeight}" Classes="Large"
Margin="{DynamicResource ToastCardIconMargin}" Margin="{DynamicResource ToastCardIconMargin}"
VerticalAlignment="Top" VerticalAlignment="Top"
IsVisible="{TemplateBinding ShowIcon}" IsVisible="{TemplateBinding ShowIcon}"