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

fix: address issue #116 and #117

Browse Source
This commit is contained in:
rabbitism
2023-03-09 16:00:59 +08:00
parent 224a759874
commit dd45da715a
4 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,9 +99,6 @@
RecognizesAccessKey="True" />
</ControlTemplate>
</Setter>
<Style Selector="^:disabled">
<Setter Property="Label.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
</Style>
<Style Selector="^.Secondary">
<Setter Property="Label.Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
</Style>
@@ -133,6 +130,9 @@
<Setter Property="Label.FontFamily" Value="{DynamicResource CodeFontFamily}" />
<Setter Property="Label.FontSize" Value="{DynamicResource TextBlockCodeFontSize}" />
</Style>
<Style Selector="^:disabled">
<Setter Property="Label.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
</Style>
</ControlTheme>
<ControlTheme
x:Key="TitleLabel"

18
src/Semi.Avalonia/Controls/SelectableTextBlock.axaml
View File

@@ -17,9 +17,6 @@
<Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockFontSize}" />
<Setter Property="SelectableTextBlock.Cursor" Value="Ibeam" />
<Setter Property="SelectableTextBlock.SelectionBrush" Value="{DynamicResource TextBlockSelectionBackground}" />
<Style Selector="^:disabled">
<Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
</Style>
<Style Selector="^.Secondary">
<Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
</Style>
@@ -47,8 +44,18 @@
<Style Selector="^.Delete">
<Setter Property="SelectableTextBlock.TextDecorations" Value="StrikeThrough" />
</Style>
<Style Selector="^.Underline.Delete">
<Setter Property="TextBlock.TextDecorations">
<TextDecorationCollection>
<TextDecoration Location="Underline" />
<TextDecoration Location="Strikethrough" />
</TextDecorationCollection>
</Setter>
</Style>
<Style Selector="^:disabled">
<Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
</Style>
<Style Selector="^[IsEnabled=True]">
<Setter Property="Cursor" Value="IBeam" />
<Setter Property="ContextFlyout" Value="{StaticResource SelectableTextBlockContextFlyout}" />
</Style>
</ControlTheme>
@@ -75,5 +82,8 @@
<Style Selector="^.H6">
<Setter Property="SelectableTextBlock.FontSize" Value="{DynamicResource TextBlockTitleH6FontSize}" />
</Style>
<Style Selector="^:disabled">
<Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
</Style>
</ControlTheme>
</ResourceDictionary>

17
src/Semi.Avalonia/Controls/TextBlock.axaml
View File

@@ -10,9 +10,6 @@
<ControlTheme x:Key="{x:Type TextBlock}" TargetType="TextBlock">
<!--<Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockDefaultForeground}" />-->
<Setter Property="TextBlock.FontSize" Value="{DynamicResource TextBlockFontSize}" />
<Style Selector="^:disabled">
<Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
</Style>
<Style Selector="^.Secondary">
<Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockSecondaryForeground}" />
</Style>
@@ -40,6 +37,17 @@
<Style Selector="^.Delete">
<Setter Property="TextBlock.TextDecorations" Value="StrikeThrough" />
</Style>
<Style Selector="^.Underline.Delete">
<Setter Property="TextBlock.TextDecorations">
<TextDecorationCollection>
<TextDecoration Location="Underline" />
<TextDecoration Location="Strikethrough" />
</TextDecorationCollection>
</Setter>
</Style>
<Style Selector="^:disabled">
<Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
</Style>
</ControlTheme>
<ControlTheme
x:Key="TitleTextBlock"
@@ -64,5 +72,8 @@
<Style Selector="^.H6">
<Setter Property="TextBlock.FontSize" Value="{DynamicResource TextBlockTitleH6FontSize}" />
</Style>
<Style Selector="^:disabled">
<Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockDisabledForeground}" />
</Style>
</ControlTheme>
</ResourceDictionary>