zhaoyushun1999/Semi.Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix var names and comp

Browse Source
This commit is contained in:
qile.wang 2024-03-01 20:53:55 +08:00
parent 386a3d297c
commit 0ddcb39302
3 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml
View File

@ -9,7 +9,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<StackPanel HorizontalAlignment="Left" Spacing="20"> <StackPanel HorizontalAlignment="Left" Spacing="20">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<HyperlinkButton Height="30" NavigateUri="http://www.irihi.tech/"> <HyperlinkButton Height="20" NavigateUri="http://www.irihi.tech/">
<TextBlock <TextBlock
HorizontalAlignment="Center" HorizontalAlignment="Center"
Text="iRihi Homepage" Text="iRihi Homepage"
@ -18,10 +18,7 @@
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<HyperlinkButton <HyperlinkButton Height="20" IsEnabled="False">
Height="30"
IsEnabled="False"
NavigateUri="http://www.irihi.tech/">
<TextBlock <TextBlock
HorizontalAlignment="Center" HorizontalAlignment="Center"
Text="Not Enabled" Text="Not Enabled"
@ -33,11 +30,11 @@
<HyperlinkButton <HyperlinkButton
BorderThickness="1" BorderThickness="1"
Classes="WithIcon" Classes="WithIcon"
Height="30" Height="20"
NavigateUri="http://www.irihi.tech/"> NavigateUri="http://www.irihi.tech/">
<TextBlock <TextBlock
HorizontalAlignment="Center" HorizontalAlignment="Center"
Text="test" Text="Link with Icon"
TextDecorations="Underline" TextDecorations="Underline"
VerticalAlignment="Center" /> VerticalAlignment="Center" />
</HyperlinkButton> </HyperlinkButton>

43
src/Semi.Avalonia/Controls/HyperlinkButton.axaml
View File

@ -9,10 +9,10 @@
<Setter Property="Cursor" Value="Hand" /> <Setter Property="Cursor" Value="Hand" />
<Setter Property="HorizontalContentAlignment" Value="Left" /> <Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="FontSize" Value="{DynamicResource CheckBoxFontSize}" /> <Setter Property="FontSize" Value="{DynamicResource HyperlinkButtonFontSize}" />
<Setter Property="MinHeight" Value="32" /> <Setter Property="MinHeight" Value="32" />
<Setter Property="Foreground" Value="{DynamicResource CheckBoxForeground}" /> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonForeground}" />
<Setter Property="Background" Value="{DynamicResource CheckBoxDefaultBackground}" /> <Setter Property="Background" Value="{DynamicResource HyperlinkButtonDefaultBackground}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="HyperlinkButton"> <ControlTemplate TargetType="HyperlinkButton">
<ContentPresenter <ContentPresenter
@ -34,7 +34,7 @@
<!-- Unvisited Pointerover State --> <!-- Unvisited Pointerover State -->
<Style Selector="^:pointerover"> <Style Selector="^:pointerover">
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" /> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
</Style> </Style>
<!-- Unvisited Pressed State --> <!-- Unvisited Pressed State -->
@ -44,15 +44,15 @@
<!-- Unvisited Disabled state --> <!-- Unvisited Disabled state -->
<Style Selector="^:disabled"> <Style Selector="^:disabled">
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" /> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
</Style> </Style>
<Style Selector="^:visited"> <Style Selector="^:visited">
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" /> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonVisitedForeground}" />
<!-- Visited Pointerover State --> <!-- Visited Pointerover State -->
<Style Selector="^:pointerover"> <Style Selector="^:pointerover">
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" /> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
</Style> </Style>
<!-- Visited Pressed State --> <!-- Visited Pressed State -->
@ -62,7 +62,7 @@
<!-- Visited Disabled State --> <!-- Visited Disabled State -->
<Style Selector="^:disabled"> <Style Selector="^:disabled">
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" /> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
</Style> </Style>
</Style> </Style>
@ -72,7 +72,7 @@
<Grid ColumnDefinitions="Auto,*" x:Name="RootGrid"> <Grid ColumnDefinitions="Auto,*" x:Name="RootGrid">
<Grid Grid.Column="0" VerticalAlignment="Center"> <Grid Grid.Column="0" VerticalAlignment="Center">
<Border <Border
Background="{DynamicResource CheckBoxDefaultBackground}" Background="{DynamicResource HyperlinkButtonDefaultBackground}"
Height="{DynamicResource HyperlinkButtonIconHeight}" Height="{DynamicResource HyperlinkButtonIconHeight}"
Opacity="0" Opacity="0"
UseLayoutRounding="False" UseLayoutRounding="False"
@ -80,7 +80,7 @@
x:Name="BackgroundRectangle" /> x:Name="BackgroundRectangle" />
<PathIcon <PathIcon
Data="{DynamicResource HyperlinkButtonLinkGlyph}" Data="{DynamicResource HyperlinkButtonLinkGlyph}"
Foreground="{DynamicResource CheckBoxForeground}" Foreground="{DynamicResource HyperlinkButtonForeground}"
Height="{DynamicResource HyperlinkButtonLinkGlyphHeight}" Height="{DynamicResource HyperlinkButtonLinkGlyphHeight}"
Name="LinkGlyph" Name="LinkGlyph"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -92,11 +92,8 @@
Cursor="{TemplateBinding Cursor}" Cursor="{TemplateBinding Cursor}"
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
IsVisible="{TemplateBinding Content,
Converter={x:Static ObjectConverters.IsNotNull}}"
Padding="8,0,0,0" Padding="8,0,0,0"
RecognizesAccessKey="True" RecognizesAccessKey="True"
TextWrapping="Wrap"
VerticalAlignment="Center" VerticalAlignment="Center"
x:Name="ContentPresenter" /> x:Name="ContentPresenter" />
</Grid> </Grid>
@ -105,10 +102,10 @@
<!-- Unvisited Pointerover State --> <!-- Unvisited Pointerover State -->
<Style Selector="^:pointerover"> <Style Selector="^:pointerover">
<Style Selector="^ /template/ PathIcon#LinkGlyph"> <Style Selector="^ /template/ PathIcon#LinkGlyph">
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" /> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
</Style> </Style>
<Style Selector="^ /template/ ContentPresenter#ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" /> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
</Style> </Style>
</Style> </Style>
@ -120,28 +117,28 @@
<!-- Unvisited Disabled state --> <!-- Unvisited Disabled state -->
<Style Selector="^:disabled"> <Style Selector="^:disabled">
<Style Selector="^ /template/ PathIcon#LinkGlyph"> <Style Selector="^ /template/ PathIcon#LinkGlyph">
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" /> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
</Style> </Style>
<Style Selector="^ /template/ ContentPresenter#ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" /> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
</Style> </Style>
</Style> </Style>
<Style Selector="^:visited"> <Style Selector="^:visited">
<Style Selector="^ /template/ PathIcon#LinkGlyph"> <Style Selector="^ /template/ PathIcon#LinkGlyph">
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" /> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonVisitedForeground}" />
</Style> </Style>
<Style Selector="^ /template/ ContentPresenter#ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultTertiaryForeground}" /> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonVisitedForeground}" />
</Style> </Style>
<!-- Visited Pointerover State --> <!-- Visited Pointerover State -->
<Style Selector="^:pointerover"> <Style Selector="^:pointerover">
<Style Selector="^ /template/ PathIcon#LinkGlyph"> <Style Selector="^ /template/ PathIcon#LinkGlyph">
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" /> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
</Style> </Style>
<Style Selector="^ /template/ ContentPresenter#ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultPrimaryForeground}" /> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonOverForeground}" />
</Style> </Style>
</Style> </Style>
@ -153,10 +150,10 @@
<!-- Visited Disabled State --> <!-- Visited Disabled State -->
<Style Selector="^:disabled"> <Style Selector="^:disabled">
<Style Selector="^ /template/ PathIcon#LinkGlyph"> <Style Selector="^ /template/ PathIcon#LinkGlyph">
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" /> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
</Style> </Style>
<Style Selector="^ /template/ ContentPresenter#ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource ButtonDefaultDisabledForeground}" /> <Setter Property="Foreground" Value="{DynamicResource HyperlinkButtonDisabledForeground}" />
</Style> </Style>
</Style> </Style>
</Style> </Style>

10
src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml
View File

@ -5,5 +5,15 @@
<x:Double x:Key="HyperlinkButtonLinkGlyphWidth">12</x:Double> <x:Double x:Key="HyperlinkButtonLinkGlyphWidth">12</x:Double>
<x:Double x:Key="HyperlinkButtonLinkGlyphHeight">12</x:Double> <x:Double x:Key="HyperlinkButtonLinkGlyphHeight">12</x:Double>
<SolidColorBrush Color="#1C1F23" x:Key="HyperlinkButtonForeground" />
<SolidColorBrush Color="Transparent" x:Key="HyperlinkButtonDefaultBackground" />
<SolidColorBrush Color="#0077FA" x:Key="HyperlinkButtonOverForeground" />
<SolidColorBrush
Color="#1C1F23"
Opacity="0.35"
x:Key="HyperlinkButtonDisabledForeground" />
<SolidColorBrush Color="#681DA8" x:Key="HyperlinkButtonVisitedForeground" />
<PathGeometry x:Key="HyperlinkButtonLinkGlyph">M 12.9393 2.9393 C 15.182 0.69666 18.818 0.696668 21.0606 2.93931 C 23.3033 5.18195 23.3033 8.81799 21.0606 11.0606 L 18.3925 13.7288 C 18.4631 13.3298 18.5 12.9192 18.5 12.5 C 18.5 11.5751 18.3206 10.6921 17.9947 9.88386 L 18.9393 8.93931 C 20.0104 7.86824 20.0104 6.13169 18.9393 5.06063 C 17.8682 3.98956 16.1317 3.98956 15.0606 5.06062 L 11.0606 9.06063 C 9.98956 10.1317 9.98956 11.8682 11.0606 12.9393 C 11.3265 13.2052 11.6335 13.4051 11.961 13.539 L 9.75848 15.7415 C 9.47 15.5439 9.19556 15.3169 8.9393 15.0606 C 6.69666 12.818 6.69666 9.18195 8.9393 6.93931 L 12.9393 2.9393 Z M 2.9393 12.9393 L 5.60751 10.2711 C 5.53685 10.6701 5.49999 11.0808 5.49999 11.5001 C 5.49999 12.4249 5.67935 13.3079 6.00519 14.1161 L 5.06062 15.0607 C 3.98956 16.1317 3.98956 17.8683 5.06063 18.9393 C 6.13169 20.0104 7.86824 20.0104 8.9393 18.9393 L 12.9393 14.9393 C 14.0104 13.8683 14.0104 12.1317 12.9393 11.0607 C 12.7664 10.8878 12.5762 10.7428 12.3743 10.6258 L 14.5302 8.46985 C 14.7141 8.61357 14.8914 8.77007 15.0606 8.93934 C 17.3033 11.182 17.3033 14.818 15.0606 17.0607 L 11.0606 21.0607 C 8.81798 23.3033 5.18194 23.3033 2.9393 21.0607 C 0.696665 18.818 0.696663 15.182 2.9393 12.9393 Z</PathGeometry> <PathGeometry x:Key="HyperlinkButtonLinkGlyph">M 12.9393 2.9393 C 15.182 0.69666 18.818 0.696668 21.0606 2.93931 C 23.3033 5.18195 23.3033 8.81799 21.0606 11.0606 L 18.3925 13.7288 C 18.4631 13.3298 18.5 12.9192 18.5 12.5 C 18.5 11.5751 18.3206 10.6921 17.9947 9.88386 L 18.9393 8.93931 C 20.0104 7.86824 20.0104 6.13169 18.9393 5.06063 C 17.8682 3.98956 16.1317 3.98956 15.0606 5.06062 L 11.0606 9.06063 C 9.98956 10.1317 9.98956 11.8682 11.0606 12.9393 C 11.3265 13.2052 11.6335 13.4051 11.961 13.539 L 9.75848 15.7415 C 9.47 15.5439 9.19556 15.3169 8.9393 15.0606 C 6.69666 12.818 6.69666 9.18195 8.9393 6.93931 L 12.9393 2.9393 Z M 2.9393 12.9393 L 5.60751 10.2711 C 5.53685 10.6701 5.49999 11.0808 5.49999 11.5001 C 5.49999 12.4249 5.67935 13.3079 6.00519 14.1161 L 5.06062 15.0607 C 3.98956 16.1317 3.98956 17.8683 5.06063 18.9393 C 6.13169 20.0104 7.86824 20.0104 8.9393 18.9393 L 12.9393 14.9393 C 14.0104 13.8683 14.0104 12.1317 12.9393 11.0607 C 12.7664 10.8878 12.5762 10.7428 12.3743 10.6258 L 14.5302 8.46985 C 14.7141 8.61357 14.8914 8.77007 15.0606 8.93934 C 17.3033 11.182 17.3033 14.818 15.0606 17.0607 L 11.0606 21.0607 C 8.81798 23.3033 5.18194 23.3033 2.9393 21.0607 C 0.696665 18.818 0.696663 15.182 2.9393 12.9393 Z</PathGeometry>
</ResourceDictionary> </ResourceDictionary>