From d19cc9d7b9a312acdccddec88fcbc2b2c68d56b5 Mon Sep 17 00:00:00 2001 From: "qile.wang" Date: Wed, 28 Feb 2024 15:21:48 +0800 Subject: [PATCH] push changes --- Semi.Avalonia.sln | 3 + .../Pages/HyperlinkButtonDemo.axaml | 34 ++++++ .../Pages/HyperlinkButtonDemo.axaml.cs | 14 +++ .../Semi.Avalonia.Demo.csproj | 7 ++ demo/Semi.Avalonia.Demo/Views/MainView.axaml | 49 ++++---- .../Controls/HyperlinkButton.axaml | 108 ++++++++++++++++++ src/Semi.Avalonia/Controls/_index.axaml | 5 +- .../Themes/Shared/HyperlinkButton.axaml | 9 ++ src/Semi.Avalonia/Themes/Shared/_index.axaml | 1 + 9 files changed, 205 insertions(+), 25 deletions(-) create mode 100644 demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml create mode 100644 demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml.cs create mode 100644 src/Semi.Avalonia/Controls/HyperlinkButton.axaml create mode 100644 src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml diff --git a/Semi.Avalonia.sln b/Semi.Avalonia.sln index 827c045..0586888 100644 --- a/Semi.Avalonia.sln +++ b/Semi.Avalonia.sln @@ -94,4 +94,7 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7CA41ED3-2CED-40CC-AA21-28C3B42B1E86} EndGlobalSection + GlobalSection(RiderSharedRunConfigurations) = postSolution + File = .run\SC-Single.run.xml + EndGlobalSection EndGlobal diff --git a/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml new file mode 100644 index 0000000..7694174 --- /dev/null +++ b/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml.cs new file mode 100644 index 0000000..ad93fd0 --- /dev/null +++ b/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml.cs @@ -0,0 +1,14 @@ +using System; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Markup.Xaml; + +namespace Semi.Avalonia.Demo.Pages; + +public partial class HyperlinkButtonDemo : UserControl +{ + public HyperlinkButtonDemo() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj b/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj index 8b1e2c3..252d0e1 100644 --- a/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj +++ b/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj @@ -23,4 +23,11 @@ + + + + HyperLinkButtonDemo.axaml + Code + + diff --git a/demo/Semi.Avalonia.Demo/Views/MainView.axaml b/demo/Semi.Avalonia.Demo/Views/MainView.axaml index 0b40a59..9979101 100644 --- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml +++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml @@ -1,13 +1,13 @@ + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> @@ -21,52 +21,52 @@ Margin="8" Padding="12,4" Theme="{DynamicResource CardBorder}"> - + + Theme="{DynamicResource TitleTextBlock}" + VerticalAlignment="Center" /> + Text="/" + VerticalAlignment="Center" /> + Margin="8,0" + Text="{Binding #tab.SelectedItem.Header}" + VerticalAlignment="Center" /> + Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" + Height="16" + Width="16" /> + Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" + Height="16" + Width="16" /> @@ -126,6 +126,9 @@ + + + @@ -145,7 +148,7 @@ - + diff --git a/src/Semi.Avalonia/Controls/HyperlinkButton.axaml b/src/Semi.Avalonia/Controls/HyperlinkButton.axaml new file mode 100644 index 0000000..52a48ea --- /dev/null +++ b/src/Semi.Avalonia/Controls/HyperlinkButton.axaml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Controls/_index.axaml b/src/Semi.Avalonia/Controls/_index.axaml index e8f6631..7858a19 100644 --- a/src/Semi.Avalonia/Controls/_index.axaml +++ b/src/Semi.Avalonia/Controls/_index.axaml @@ -1,7 +1,7 @@ + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> @@ -24,6 +24,7 @@ + diff --git a/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml new file mode 100644 index 0000000..0614af1 --- /dev/null +++ b/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml @@ -0,0 +1,9 @@ + + 14 + 16 + 16 + 16 + 16 + + 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 + diff --git a/src/Semi.Avalonia/Themes/Shared/_index.axaml b/src/Semi.Avalonia/Themes/Shared/_index.axaml index 249105f..d01988a 100644 --- a/src/Semi.Avalonia/Themes/Shared/_index.axaml +++ b/src/Semi.Avalonia/Themes/Shared/_index.axaml @@ -20,6 +20,7 @@ +