zhusenlin/Semi.Avalonia
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/se/Semi.Avalonia synced 2026-03-19 16:06:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #597 from irihitech/various

Browse Source 
fix disabled fill color in RadioButton & add default FontWeight to TagLabel
This commit is contained in:
Dong Bin
2025-04-16 22:00:10 +08:00
committed by GitHub
parent 471764f355 49a3eada34
commit 5bd08daaac
5 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
demo/Semi.Avalonia.Demo/Pages/TabStripDemo.axaml
View File

@@ -5,6 +5,7 @@
xmlns:vm="clr-namespace:Semi.Avalonia.Demo.ViewModels"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Semi.Avalonia.Demo.Pages.TabStripDemo"
x:CompileBindings="True"
x:DataType="vm:TabStripDemoViewModel">
<Design.DataContext>
<vm:TabStripDemoViewModel />

1
src/Semi.Avalonia/Controls/Label.axaml
View File

@@ -173,6 +173,7 @@
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="Padding" Value="{DynamicResource LabelTagSmallPadding}" />
<Setter Property="FontSize" Value="{DynamicResource LabelTagFontSize}" />
<Setter Property="FontWeight" Value="{DynamicResource LabelTagFontWeight}" />
<Setter Property="Template">
<ControlTemplate TargetType="Label">
<ContentPresenter

2
src/Semi.Avalonia/Themes/Dark/RadioButton.axaml
View File

@@ -4,7 +4,7 @@
<SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBackground" Color="Transparent" />
<StaticResource x:Key="RadioButtonUncheckIconPointeroverBackground" ResourceKey="SemiColorFill0" />
<StaticResource x:Key="RadioButtonUncheckIconPressedBackground" ResourceKey="SemiColorFill1" />
<StaticResource x:Key="RadioButtonUncheckIconDisabledBackground" ResourceKey="SemiColorFill0" />
<StaticResource x:Key="RadioButtonUncheckIconDisabledBackground" ResourceKey="SemiColorDisabledFill" />
<StaticResource x:Key="RadioButtonUncheckIconDefaultBorderBrush" ResourceKey="SemiColorText3" />
<StaticResource x:Key="RadioButtonUncheckIconPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
<StaticResource x:Key="RadioButtonUncheckIconPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />

2
src/Semi.Avalonia/Themes/Light/RadioButton.axaml
View File

@@ -4,7 +4,7 @@
<SolidColorBrush x:Key="RadioButtonUncheckIconDefaultBackground" Color="Transparent" />
<StaticResource x:Key="RadioButtonUncheckIconPointeroverBackground" ResourceKey="SemiColorFill0" />
<StaticResource x:Key="RadioButtonUncheckIconPressedBackground" ResourceKey="SemiColorFill1" />
<StaticResource x:Key="RadioButtonUncheckIconDisabledBackground" ResourceKey="SemiColorFill0" />
<StaticResource x:Key="RadioButtonUncheckIconDisabledBackground" ResourceKey="SemiColorDisabledFill" />
<StaticResource x:Key="RadioButtonUncheckIconDefaultBorderBrush" ResourceKey="SemiColorText3" />
<StaticResource x:Key="RadioButtonUncheckIconPointeroverBorderBrush" ResourceKey="SemiColorPrimaryPointerover" />
<StaticResource x:Key="RadioButtonUncheckIconPressedBorderBrush" ResourceKey="SemiColorPrimaryActive" />

1
src/Semi.Avalonia/Themes/Shared/Label.axaml
View File

@@ -5,6 +5,7 @@
<x:Double x:Key="LabelTagSmallHeight">20</x:Double>
<x:Double x:Key="LabelTagLargeHeight">24</x:Double>
<StaticResource x:Key="LabelTagFontSize" ResourceKey="SemiFontSizeSmall" />
<StaticResource x:Key="LabelTagFontWeight" ResourceKey="SemiFontWeightRegular" />
<StaticResource x:Key="LabelTagSquareCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
<StaticResource x:Key="LabelTagCircleCornerRadius" ResourceKey="SemiBorderRadiusFull" />
</ResourceDictionary>