From 5451495c5cdf4ea81843d21f07d5f93c4ea95a54 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Fri, 8 Nov 2024 17:42:34 +0800
Subject: [PATCH] feat: redesign HyperlinkButton.
add OnlyIcon & Underline Classes to HyperlinkButton.
---
.../Pages/HyperlinkButtonDemo.axaml | 46 +++----
.../Controls/HyperlinkButton.axaml | 122 ++++++++----------
.../Themes/Dark/HyperlinkButton.axaml | 10 +-
.../Themes/HighContrast/HyperlinkButton.axaml | 4 +-
.../Themes/Light/HyperlinkButton.axaml | 8 +-
.../Themes/Shared/HyperlinkButton.axaml | 10 +-
6 files changed, 84 insertions(+), 116 deletions(-)
diff --git a/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml
index 897a75b..10b774b 100644
--- a/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/HyperlinkButtonDemo.axaml
@@ -8,36 +8,22 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/HyperlinkButton.axaml b/src/Semi.Avalonia/Controls/HyperlinkButton.axaml
index de6f406..cb7c397 100644
--- a/src/Semi.Avalonia/Controls/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Controls/HyperlinkButton.axaml
@@ -1,118 +1,100 @@
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ x:CompileBindings="True">
+
+
+
+ 链接文本
+
+
+ 网页链接
+
+
+ OnlyIcon
+
+
+
-
-
-
+
-
+
-
-
+
-
-
-
+ Data="{DynamicResource HyperlinkButtonLinkGlyph}"
+ Foreground="{TemplateBinding Foreground}"
+ Width="{DynamicResource HyperlinkButtonLinkGlyphWidth}"
+ Height="{DynamicResource HyperlinkButtonLinkGlyphHeight}" />
-
+ RecognizesAccessKey="True" />
+
-
+
-
-
-
+
-
+
-
-
+
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml
index d0761c0..82f0260 100644
--- a/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/HyperlinkButton.axaml
@@ -1,7 +1,7 @@
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/HighContrast/HyperlinkButton.axaml
index 8f8b9d1..a1ce552 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/HyperlinkButton.axaml
@@ -1,7 +1,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml
index 08ee311..c7356e7 100644
--- a/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/Light/HyperlinkButton.axaml
@@ -1,7 +1,7 @@
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml b/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml
index 1119ef0..9187210 100644
--- a/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/HyperlinkButton.axaml
@@ -1,9 +1,9 @@
14
- 12
- 12
- 12
- 12
+ 600
+ 14
+ 14
+ 0 0 4 0
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
-
+
\ No newline at end of file