Merge branch 'main' into combo

# Conflicts:
#	src/Ursa.Themes.Semi/Compatibles/Icon.axaml
This commit is contained in:
Zhang Dian
2025-01-14 01:17:25 +08:00
14 changed files with 86 additions and 112 deletions

View File

@@ -1,7 +1,6 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:u="https://irihi.tech/ursa">
<!-- Add Resources Here -->
<ControlTheme TargetType="u:ThemeToggleButton" x:Key="{x:Type u:ThemeToggleButton}">
<Setter Property="Template">
<ControlTemplate TargetType="u:ThemeToggleButton">
@@ -13,8 +12,7 @@
Theme="{DynamicResource BorderlessButton}">
<PathIcon
Name="PART_Icon"
Width="16"
Height="16"
Theme="{StaticResource InnerPathIcon}"
Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
</Button>
</ControlTemplate>
@@ -32,4 +30,4 @@
<Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_SYSTEM}" />
</Style>
</ControlTheme>
</ResourceDictionary>
</ResourceDictionary>