From a7debb7886e590a9ed81e268e66eec8fab7504e2 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Tue, 25 Mar 2025 10:49:35 +0800
Subject: [PATCH 01/15] fix: fix issues in TabControl.
---
demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml | 49 ---------
demo/Semi.Avalonia.Demo/Themes/_index.axaml | 1 -
demo/Semi.Avalonia.Demo/Views/MainView.axaml | 13 ++-
src/Semi.Avalonia/Controls/TabControl.axaml | 108 +++++++++----------
src/Semi.Avalonia/Controls/TabItem.axaml | 14 +--
5 files changed, 68 insertions(+), 117 deletions(-)
delete mode 100644 demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml
diff --git a/demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml b/demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml
deleted file mode 100644
index 43e3b8e..0000000
--- a/demo/Semi.Avalonia.Demo/Themes/TabMenu.axaml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Themes/_index.axaml b/demo/Semi.Avalonia.Demo/Themes/_index.axaml
index 6e47828..cfccca3 100644
--- a/demo/Semi.Avalonia.Demo/Themes/_index.axaml
+++ b/demo/Semi.Avalonia.Demo/Themes/_index.axaml
@@ -4,7 +4,6 @@
-
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Views/MainView.axaml b/demo/Semi.Avalonia.Demo/Views/MainView.axaml
index 6e4427b..6bd2c0c 100644
--- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml
+++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml
@@ -78,10 +78,19 @@
Grid.Row="1"
Margin="8"
Padding="20,0,0,0"
- HorizontalAlignment="Stretch"
TabStripPlacement="Left"
Classes.Dismiss="{Binding #ExpandButton.IsChecked}"
- Theme="{DynamicResource NavigationTab}">
+ Theme="{DynamicResource ScrollTabControl}">
+
+
+
+
+
+
+
+
diff --git a/src/Semi.Avalonia/Controls/TabControl.axaml b/src/Semi.Avalonia/Controls/TabControl.axaml
index e37f12d..81e3306 100644
--- a/src/Semi.Avalonia/Controls/TabControl.axaml
+++ b/src/Semi.Avalonia/Controls/TabControl.axaml
@@ -3,9 +3,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:CompileBindings="True">
-
-
-
-
-
+
+
-
-
-
-
-
-
@@ -85,10 +79,18 @@
CornerRadius="{TemplateBinding CornerRadius}">
-
-
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/TabItem.axaml b/src/Semi.Avalonia/Controls/TabItem.axaml
index 2c44f96..b32ccd4 100644
--- a/src/Semi.Avalonia/Controls/TabItem.axaml
+++ b/src/Semi.Avalonia/Controls/TabItem.axaml
@@ -14,7 +14,6 @@
-
@@ -70,12 +69,6 @@
-
-
-
-
@@ -129,5 +122,4 @@
-
\ No newline at end of file
From c447fd8d5d1ce594b02af28816525c249e4dcf05 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Tue, 25 Mar 2025 23:50:21 +0800
Subject: [PATCH 02/15] feat: add LineTabControl Theme.
---
demo/Semi.Avalonia.Demo/Views/MainView.axaml | 2 +-
src/Semi.Avalonia/Controls/TabControl.axaml | 150 +++++++++++++++++++
src/Semi.Avalonia/Controls/TabItem.axaml | 101 ++++++++++++-
3 files changed, 247 insertions(+), 6 deletions(-)
diff --git a/demo/Semi.Avalonia.Demo/Views/MainView.axaml b/demo/Semi.Avalonia.Demo/Views/MainView.axaml
index 6bd2c0c..9288411 100644
--- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml
+++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml
@@ -80,7 +80,7 @@
Padding="20,0,0,0"
TabStripPlacement="Left"
Classes.Dismiss="{Binding #ExpandButton.IsChecked}"
- Theme="{DynamicResource ScrollTabControl}">
+ Theme="{DynamicResource ScrollLineTabControl}">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/TabItem.axaml b/src/Semi.Avalonia/Controls/TabItem.axaml
index b32ccd4..ac385b6 100644
--- a/src/Semi.Avalonia/Controls/TabItem.axaml
+++ b/src/Semi.Avalonia/Controls/TabItem.axaml
@@ -2,12 +2,21 @@
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:CompileBindings="True">
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -122,4 +131,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From c5e8bd6662b18a4479445e072cfe3a0eb6251df5 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 26 Mar 2025 17:19:37 +0800
Subject: [PATCH 03/15] feat: add CardTabControl & ButtonTabControl.
---
src/Semi.Avalonia/Controls/TabControl.axaml | 106 ++++++++++++++-
src/Semi.Avalonia/Controls/TabItem.axaml | 133 +++++++++++++++++++
src/Semi.Avalonia/Themes/Dark/TabItem.axaml | 2 +-
src/Semi.Avalonia/Themes/Light/TabItem.axaml | 2 +-
4 files changed, 239 insertions(+), 4 deletions(-)
diff --git a/src/Semi.Avalonia/Controls/TabControl.axaml b/src/Semi.Avalonia/Controls/TabControl.axaml
index 072863d..32e0973 100644
--- a/src/Semi.Avalonia/Controls/TabControl.axaml
+++ b/src/Semi.Avalonia/Controls/TabControl.axaml
@@ -37,7 +37,7 @@
ItemsPanel="{TemplateBinding ItemsPanel}" />
+ Background="{DynamicResource SemiColorBorder}" />
+ BorderBrush="{DynamicResource SemiColorBorder}">
@@ -300,4 +300,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/TabItem.axaml b/src/Semi.Avalonia/Controls/TabItem.axaml
index ac385b6..b62ca5a 100644
--- a/src/Semi.Avalonia/Controls/TabItem.axaml
+++ b/src/Semi.Avalonia/Controls/TabItem.axaml
@@ -213,4 +213,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/TabItem.axaml b/src/Semi.Avalonia/Themes/Dark/TabItem.axaml
index dc8da64..0e3f003 100644
--- a/src/Semi.Avalonia/Themes/Dark/TabItem.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TabItem.axaml
@@ -5,6 +5,6 @@
-
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/TabItem.axaml b/src/Semi.Avalonia/Themes/Light/TabItem.axaml
index dc8da64..0e3f003 100644
--- a/src/Semi.Avalonia/Themes/Light/TabItem.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TabItem.axaml
@@ -5,6 +5,6 @@
-
+
\ No newline at end of file
From 7751f417f02ecf325ea238c9c2c652c4f3d55442 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 26 Mar 2025 23:57:45 +0800
Subject: [PATCH 04/15] feat: add BaseTabControl.
---
src/Semi.Avalonia/Controls/TabControl.axaml | 128 +++-------
src/Semi.Avalonia/Controls/TabItem.axaml | 253 +++++---------------
2 files changed, 97 insertions(+), 284 deletions(-)
diff --git a/src/Semi.Avalonia/Controls/TabControl.axaml b/src/Semi.Avalonia/Controls/TabControl.axaml
index 32e0973..bfea30a 100644
--- a/src/Semi.Avalonia/Controls/TabControl.axaml
+++ b/src/Semi.Avalonia/Controls/TabControl.axaml
@@ -20,7 +20,7 @@
-
+
-
-
+
+
+
+
+
@@ -169,56 +171,26 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -343,63 +315,29 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/TabItem.axaml b/src/Semi.Avalonia/Controls/TabItem.axaml
index b62ca5a..98e8b11 100644
--- a/src/Semi.Avalonia/Controls/TabItem.axaml
+++ b/src/Semi.Avalonia/Controls/TabItem.axaml
@@ -10,7 +10,7 @@
-
+
@@ -20,121 +20,9 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
From 34d36b19c8b6d2a1dac96e8d2b8db735c2adc81a Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 27 Mar 2025 00:14:29 +0800
Subject: [PATCH 05/15] feat: add other scroll TabControl themes.
---
src/Semi.Avalonia/Controls/TabControl.axaml | 377 +++++++++++---------
1 file changed, 209 insertions(+), 168 deletions(-)
diff --git a/src/Semi.Avalonia/Controls/TabControl.axaml b/src/Semi.Avalonia/Controls/TabControl.axaml
index bfea30a..360823a 100644
--- a/src/Semi.Avalonia/Controls/TabControl.axaml
+++ b/src/Semi.Avalonia/Controls/TabControl.axaml
@@ -82,95 +82,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -340,4 +172,213 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 3d83cd02e2edab8911d6befaa4138a9a7a3bc320 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 27 Mar 2025 00:28:09 +0800
Subject: [PATCH 06/15] feat: inherit BaseTabControl.
---
src/Semi.Avalonia/Controls/TabControl.axaml | 187 ++++++--------------
1 file changed, 51 insertions(+), 136 deletions(-)
diff --git a/src/Semi.Avalonia/Controls/TabControl.axaml b/src/Semi.Avalonia/Controls/TabControl.axaml
index 360823a..e642faf 100644
--- a/src/Semi.Avalonia/Controls/TabControl.axaml
+++ b/src/Semi.Avalonia/Controls/TabControl.axaml
@@ -35,9 +35,7 @@
-
+
-
-
+
+
+
+
+
+
+
@@ -87,25 +96,12 @@
BasedOn="{StaticResource BaseTabControl}"
TargetType="TabControl">
-
-
-
-
-
+
@@ -118,9 +114,7 @@
CornerRadius="{TemplateBinding CornerRadius}">
-
+
@@ -136,31 +130,6 @@
-
-
-
-
-
-
-
+
@@ -198,9 +168,7 @@
Name="PART_ItemsPresenter"
ItemsPanel="{TemplateBinding ItemsPanel}" />
-
+
+
+
+
+
+
+
+
-
@@ -268,32 +246,13 @@
BasedOn="{StaticResource BaseScrollTabControl}"
TargetType="TabControl">
-
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
Date: Thu, 27 Mar 2025 01:02:00 +0800
Subject: [PATCH 07/15] feat: add ReverseSeparator Classes.
---
src/Semi.Avalonia/Controls/TabControl.axaml | 66 +++++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/src/Semi.Avalonia/Controls/TabControl.axaml b/src/Semi.Avalonia/Controls/TabControl.axaml
index e642faf..3998c10 100644
--- a/src/Semi.Avalonia/Controls/TabControl.axaml
+++ b/src/Semi.Avalonia/Controls/TabControl.axaml
@@ -89,6 +89,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Date: Thu, 27 Mar 2025 01:05:33 +0800
Subject: [PATCH 08/15] misc: TabControlItem -> TabItem.
---
src/Semi.Avalonia/Controls/TabControl.axaml | 12 ++++++------
src/Semi.Avalonia/Controls/TabItem.axaml | 20 ++++++++++----------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/Semi.Avalonia/Controls/TabControl.axaml b/src/Semi.Avalonia/Controls/TabControl.axaml
index 3998c10..5777f78 100644
--- a/src/Semi.Avalonia/Controls/TabControl.axaml
+++ b/src/Semi.Avalonia/Controls/TabControl.axaml
@@ -128,14 +128,14 @@
x:Key="LineTabControl"
BasedOn="{StaticResource BaseTabControl}"
TargetType="TabControl">
-
+
-
+
-
+
@@ -311,14 +311,14 @@
x:Key="ScrollLineTabControl"
BasedOn="{StaticResource BaseScrollTabControl}"
TargetType="TabControl">
-
+
-
+
-
+
diff --git a/src/Semi.Avalonia/Controls/TabItem.axaml b/src/Semi.Avalonia/Controls/TabItem.axaml
index 98e8b11..a322fc5 100644
--- a/src/Semi.Avalonia/Controls/TabItem.axaml
+++ b/src/Semi.Avalonia/Controls/TabItem.axaml
@@ -20,7 +20,7 @@
-
+
@@ -61,7 +61,7 @@
@@ -93,8 +93,8 @@
\ No newline at end of file
From 3f67c32f035d341928ed9ab050ea4fd082bb229a Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 27 Mar 2025 17:08:13 +0800
Subject: [PATCH 09/15] feat: set the last TabItem Margin to 0.
---
src/Semi.Avalonia/Index.axaml | 2 ++
src/Semi.Avalonia/SemiTheme.axaml | 2 ++
src/Semi.Avalonia/Styles/TabControl.axaml | 5 +++++
src/Semi.Avalonia/Styles/_index.axaml | 3 +++
4 files changed, 12 insertions(+)
create mode 100644 src/Semi.Avalonia/Styles/TabControl.axaml
create mode 100644 src/Semi.Avalonia/Styles/_index.axaml
diff --git a/src/Semi.Avalonia/Index.axaml b/src/Semi.Avalonia/Index.axaml
index 334aa54..1f16c58 100644
--- a/src/Semi.Avalonia/Index.axaml
+++ b/src/Semi.Avalonia/Index.axaml
@@ -20,4 +20,6 @@
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/SemiTheme.axaml b/src/Semi.Avalonia/SemiTheme.axaml
index eea19b2..cbf8643 100644
--- a/src/Semi.Avalonia/SemiTheme.axaml
+++ b/src/Semi.Avalonia/SemiTheme.axaml
@@ -21,4 +21,6 @@
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Styles/TabControl.axaml b/src/Semi.Avalonia/Styles/TabControl.axaml
new file mode 100644
index 0000000..eaa7bc6
--- /dev/null
+++ b/src/Semi.Avalonia/Styles/TabControl.axaml
@@ -0,0 +1,5 @@
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Styles/_index.axaml b/src/Semi.Avalonia/Styles/_index.axaml
new file mode 100644
index 0000000..574fa22
--- /dev/null
+++ b/src/Semi.Avalonia/Styles/_index.axaml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
From 051b1371218907eb8103d942db5dc78d7d6970f7 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Sat, 29 Mar 2025 15:04:28 +0800
Subject: [PATCH 10/15] feat: extract color resources.
---
src/Semi.Avalonia/Controls/TabControl.axaml | 4 ++--
src/Semi.Avalonia/Controls/TabItem.axaml | 22 +++++++++----------
.../Themes/Dark/TabControl.axaml | 1 +
src/Semi.Avalonia/Themes/Dark/TabItem.axaml | 12 ++++++++++
.../Themes/HighContrast/TabControl.axaml | 1 +
.../Themes/HighContrast/TabItem.axaml | 12 ++++++++++
.../Themes/Light/TabControl.axaml | 1 +
src/Semi.Avalonia/Themes/Light/TabItem.axaml | 12 ++++++++++
8 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/src/Semi.Avalonia/Controls/TabControl.axaml b/src/Semi.Avalonia/Controls/TabControl.axaml
index 5777f78..f0e5efa 100644
--- a/src/Semi.Avalonia/Controls/TabControl.axaml
+++ b/src/Semi.Avalonia/Controls/TabControl.axaml
@@ -58,7 +58,7 @@
@@ -114,10 +114,10 @@
@@ -147,18 +147,18 @@
BasedOn="{StaticResource BaseTabItem}"
TargetType="TabItem">
-
+
@@ -201,16 +201,16 @@
diff --git a/src/Semi.Avalonia/Themes/Dark/TabControl.axaml b/src/Semi.Avalonia/Themes/Dark/TabControl.axaml
index d1981be..de620d4 100644
--- a/src/Semi.Avalonia/Themes/Dark/TabControl.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TabControl.axaml
@@ -1,2 +1,3 @@
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/TabItem.axaml b/src/Semi.Avalonia/Themes/Dark/TabItem.axaml
index 0e3f003..af5e3d0 100644
--- a/src/Semi.Avalonia/Themes/Dark/TabItem.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/TabItem.axaml
@@ -7,4 +7,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/TabControl.axaml b/src/Semi.Avalonia/Themes/HighContrast/TabControl.axaml
index d1981be..bf22944 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/TabControl.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/TabControl.axaml
@@ -1,2 +1,3 @@
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/TabItem.axaml b/src/Semi.Avalonia/Themes/HighContrast/TabItem.axaml
index 8e8b0c3..ced4623 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/TabItem.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/TabItem.axaml
@@ -7,4 +7,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/TabControl.axaml b/src/Semi.Avalonia/Themes/Light/TabControl.axaml
index d1981be..de620d4 100644
--- a/src/Semi.Avalonia/Themes/Light/TabControl.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TabControl.axaml
@@ -1,2 +1,3 @@
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/TabItem.axaml b/src/Semi.Avalonia/Themes/Light/TabItem.axaml
index 0e3f003..af5e3d0 100644
--- a/src/Semi.Avalonia/Themes/Light/TabItem.axaml
+++ b/src/Semi.Avalonia/Themes/Light/TabItem.axaml
@@ -7,4 +7,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 8e7581fbe7e5300d96c9cc40d3b9bf42ff1cb8f9 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Sun, 30 Mar 2025 00:07:16 +0800
Subject: [PATCH 11/15] fix: set TabItem HorizontalContentAlignment to Left.
---
src/Semi.Avalonia/Controls/TabControl.axaml | 4 ----
src/Semi.Avalonia/Controls/TabItem.axaml | 5 -----
2 files changed, 9 deletions(-)
diff --git a/src/Semi.Avalonia/Controls/TabControl.axaml b/src/Semi.Avalonia/Controls/TabControl.axaml
index f0e5efa..6710481 100644
--- a/src/Semi.Avalonia/Controls/TabControl.axaml
+++ b/src/Semi.Avalonia/Controls/TabControl.axaml
@@ -100,7 +100,6 @@
BasedOn="{StaticResource {x:Type TabItem}}"
TargetType="TabItem">
@@ -115,7 +114,6 @@
BasedOn="{StaticResource {x:Type TabItem}}"
TargetType="TabItem">
@@ -283,7 +281,6 @@
BasedOn="{StaticResource {x:Type TabItem}}"
TargetType="TabItem">
@@ -298,7 +295,6 @@
BasedOn="{StaticResource {x:Type TabItem}}"
TargetType="TabItem">
diff --git a/src/Semi.Avalonia/Controls/TabItem.axaml b/src/Semi.Avalonia/Controls/TabItem.axaml
index f84aa29..6a55680 100644
--- a/src/Semi.Avalonia/Controls/TabItem.axaml
+++ b/src/Semi.Avalonia/Controls/TabItem.axaml
@@ -53,10 +53,6 @@
-
-
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/TabItem.axaml b/src/Semi.Avalonia/Themes/Shared/TabItem.axaml
index bd6b384..5e6c495 100644
--- a/src/Semi.Avalonia/Themes/Shared/TabItem.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/TabItem.axaml
@@ -1,3 +1,4 @@
+
\ No newline at end of file
From 4a985f42bce88fd9752810bc335c2aa242923baf Mon Sep 17 00:00:00 2001
From: Dong Bin
Date: Thu, 3 Apr 2025 20:26:45 +0800
Subject: [PATCH 14/15] feat: update TabControlDemo layout with improved border
and alignment settings
---
.../Pages/TabControlDemo.axaml | 78 ++++++++-----------
1 file changed, 33 insertions(+), 45 deletions(-)
diff --git a/demo/Semi.Avalonia.Demo/Pages/TabControlDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/TabControlDemo.axaml
index 2dfb09d..f62cae8 100644
--- a/demo/Semi.Avalonia.Demo/Pages/TabControlDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/TabControlDemo.axaml
@@ -13,12 +13,10 @@
-
+ HorizontalAlignment="Left"
+ Theme="{StaticResource RadioButtonGroupBorder}">
+
Left
Bottom
Right
@@ -29,20 +27,14 @@
-
-
+ Spacing="8">
+
+
-
-
+
+
@@ -53,22 +45,19 @@
IsEnabled="False" />
-
+
+ TabStripPlacement="{Binding #place.SelectedValue}"
+ Theme="{StaticResource ScrollTabControl}" />
-
-
+
+
@@ -79,21 +68,21 @@
IsEnabled="False" />
-
+
+ TabStripPlacement="{Binding #place.SelectedValue}"
+ Theme="{StaticResource ScrollLineTabControl}" />
-
-
+
+
@@ -104,21 +93,21 @@
IsEnabled="False" />
-
+
+ TabStripPlacement="{Binding #place.SelectedValue}"
+ Theme="{StaticResource ScrollCardTabControl}" />
-
-
+
+
@@ -129,12 +118,11 @@
IsEnabled="False" />
-
+
+ TabStripPlacement="{Binding #place.SelectedValue}"
+ Theme="{StaticResource ScrollButtonTabControl}" />
From 610d7f40581098cc5dba8362db6817139829aa51 Mon Sep 17 00:00:00 2001
From: Dong Bin
Date: Thu, 3 Apr 2025 21:27:59 +0800
Subject: [PATCH 15/15] misc: minor format issue.
---
src/Semi.Avalonia/Themes/Shared/TabItem.axaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Semi.Avalonia/Themes/Shared/TabItem.axaml b/src/Semi.Avalonia/Themes/Shared/TabItem.axaml
index 5e6c495..9e017ba 100644
--- a/src/Semi.Avalonia/Themes/Shared/TabItem.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/TabItem.axaml
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file