From 3af7e2f29a3ac2d55d6266849c07de8bfdd0ba7f Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Tue, 6 Aug 2024 16:38:45 +0800
Subject: [PATCH] feat: add OnContent & OffContent to SimpleToggleSwitch.
---
.../Pages/ToggleSwitchDemo.axaml | 25 +++++--
src/Semi.Avalonia/Controls/ToggleSwitch.axaml | 68 ++++++++++++++-----
.../Themes/Dark/ToggleSwitch.axaml | 3 +
.../Themes/Light/ToggleSwitch.axaml | 3 +
.../Themes/Shared/ToggleSwitch.axaml | 2 +
5 files changed, 79 insertions(+), 22 deletions(-)
diff --git a/demo/Semi.Avalonia.Demo/Pages/ToggleSwitchDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ToggleSwitchDemo.axaml
index 94299c2..1a23866 100644
--- a/demo/Semi.Avalonia.Demo/Pages/ToggleSwitchDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ToggleSwitchDemo.axaml
@@ -26,9 +26,9 @@
OnContent="OnContent" />
-
+
-
+
@@ -38,9 +38,26 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
index 8bb8bc6..0ea882c 100644
--- a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml
@@ -278,29 +278,29 @@
x:Key="SimpleToggleSwitch"
BasedOn="{StaticResource {x:Type ToggleSwitch}}"
TargetType="ToggleSwitch">
+
+
+
-
+ Width="{DynamicResource ToggleSwitchDefaultWidth}"
+ Height="{DynamicResource ToggleSwitchDefaultHeight}"
+ CornerRadius="100">
+
+
+
+
+
-
-
-
-
-
-
+ ColumnDefinitions="*,*">
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
index e087b2f..f5d6888 100644
--- a/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/ToggleSwitch.axaml
@@ -10,4 +10,7 @@
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
index f1807ce..b86d9b1 100644
--- a/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ToggleSwitch.axaml
@@ -10,4 +10,7 @@
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml b/src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml
index 56a0b72..eaa89b4 100644
--- a/src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/ToggleSwitch.axaml
@@ -19,4 +19,6 @@
8 4
8 4
+
+ 14
\ No newline at end of file