From 986d49c2d96fa51e9038e31bb451c871c06e1365 Mon Sep 17 00:00:00 2001
From: excelsior <356647124@qq.com>
Date: Fri, 13 Nov 2026 13:50:25 +0800
Subject: [PATCH 1/2] feat: add Tag option to control Expander header text
 orientation

Co-authored-by: sisyphus-dev-ai <sisyphus-dev-ai@users.noreply.github.com>
---
 .../Themes/Styles/Base/ExpanderBaseStyle.xaml | 46 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml
index 8412b1f3..7b08c31d 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml
@@ -19,7 +19,7 @@
                             <RotateTransform Angle="-90" />
                         </TransformGroup>
                     </Grid.LayoutTransform>
-                    <ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                    <ContentPresenter Name="HeaderText" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
                     <Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource UpGeometry}" Width="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Center" />
                 </Grid>
             </ToggleButton>
@@ -34,6 +34,27 @@
             <Trigger Property="IsEnabled" Value="false">
                 <Setter Property="Opacity" Value=".4" />
             </Trigger>
+            <Trigger Property="Tag" Value="Vertical">
+                <Setter TargetName="HeaderText" Property="LayoutTransform">
+                    <Setter.Value>
+                        <RotateTransform Angle="90" />
+                    </Setter.Value>
+                </Setter>
+                <Setter TargetName="HeaderText" Property="ContentTemplate">
+                    <Setter.Value>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding}" TextWrapping="Wrap" TextAlignment="Center" Width="{Binding FontSize, RelativeSource={RelativeSource AncestorType=Expander}}" />
+                        </DataTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+            <Trigger Property="Tag" Value="Horizontal">
+                <Setter TargetName="HeaderText" Property="LayoutTransform">
+                    <Setter.Value>
+                        <RotateTransform Angle="90" />
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
@@ -84,7 +105,7 @@
                             <RotateTransform Angle="-90" />
                         </TransformGroup>
                     </Grid.LayoutTransform>
-                    <ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                    <ContentPresenter Name="HeaderText" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
                     <Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource DownGeometry}" Width="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Center" />
                 </Grid>
             </ToggleButton>
@@ -99,6 +120,27 @@
             <Trigger Property="IsEnabled" Value="false">
                 <Setter Property="Opacity" Value=".4" />
             </Trigger>
+            <Trigger Property="Tag" Value="Vertical">
+                <Setter TargetName="HeaderText" Property="LayoutTransform">
+                    <Setter.Value>
+                        <RotateTransform Angle="90" />
+                    </Setter.Value>
+                </Setter>
+                <Setter TargetName="HeaderText" Property="ContentTemplate">
+                    <Setter.Value>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding}" TextWrapping="Wrap" TextAlignment="Center" Width="{Binding FontSize, RelativeSource={RelativeSource AncestorType=Expander}}" />
+                        </DataTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+            <Trigger Property="Tag" Value="Horizontal">
+                <Setter TargetName="HeaderText" Property="LayoutTransform">
+                    <Setter.Value>
+                        <RotateTransform Angle="90" />
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 

From 2d6c4c3f1cc1985028e2f1b536e8678b0683eb0d Mon Sep 17 00:00:00 2001
From: excelsior <356647124@qq.com>
Date: Fri, 13 Nov 2026 16:33:29 +0800
Subject: [PATCH 2/2] refactor: use attached property
 ExpanderElement.HeaderTextOrientation instead of Tag

Co-authored-by: sisyphus-dev-ai <sisyphus-dev-ai@users.noreply.github.com>
---
 .../Controls/Attach/ExpanderElement.cs        | 37 +++++++++++++++++++
 .../HandyControl_Shared.projitems             |  1 +
 .../Themes/Styles/Base/ExpanderBaseStyle.xaml |  8 ++--
 3 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 src/Shared/HandyControl_Shared/Controls/Attach/ExpanderElement.cs

diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/ExpanderElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/ExpanderElement.cs
new file mode 100644
index 00000000..05b76f1e
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/ExpanderElement.cs
@@ -0,0 +1,37 @@
+using System.Windows;
+
+namespace HandyControl.Controls;
+
+/// <summary>
+/// Header text orientation of an <see cref="Expander"/> when <see cref="Expander.ExpandDirection"/> is Left or Right.
+/// </summary>
+public enum ExpanderHeaderTextOrientation
+{
+    /// <summary>
+    /// Same as the current behavior: the whole header is rotated -90 degrees (glyphs lying on their side).
+    /// </summary>
+    Default = 0,
+
+    /// <summary>
+    /// Upright vertical: characters stand upright and stack top-to-bottom.
+    /// </summary>
+    Vertical = 1,
+
+    /// <summary>
+    /// Upright horizontal: a single horizontal line.
+    /// </summary>
+    Horizontal = 2
+}
+
+/// <summary>
+/// Attached properties for <see cref="Expander"/>.
+/// </summary>
+public class ExpanderElement
+{
+    public static readonly DependencyProperty HeaderTextOrientationProperty = DependencyProperty.RegisterAttached(
+        "HeaderTextOrientation", typeof(ExpanderHeaderTextOrientation), typeof(ExpanderElement), new FrameworkPropertyMetadata(ExpanderHeaderTextOrientation.Default));
+
+    public static void SetHeaderTextOrientation(DependencyObject element, ExpanderHeaderTextOrientation value) => element.SetValue(HeaderTextOrientationProperty, value);
+
+    public static ExpanderHeaderTextOrientation GetHeaderTextOrientation(DependencyObject element) => (ExpanderHeaderTextOrientation) element.GetValue(HeaderTextOrientationProperty);
+}
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 2f1732d9..47744c2e 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -15,6 +15,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\DataGridAttach.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\DropDownElement.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\EdgeElement.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\ExpanderElement.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\ComboBoxAttach.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\GridAttach.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Attach\GridViewAttach.cs" />
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml
index 7b08c31d..139f2ec2 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ExpanderBaseStyle.xaml
@@ -34,7 +34,7 @@
             <Trigger Property="IsEnabled" Value="false">
                 <Setter Property="Opacity" Value=".4" />
             </Trigger>
-            <Trigger Property="Tag" Value="Vertical">
+            <Trigger Property="hc:ExpanderElement.HeaderTextOrientation" Value="Vertical">
                 <Setter TargetName="HeaderText" Property="LayoutTransform">
                     <Setter.Value>
                         <RotateTransform Angle="90" />
@@ -48,7 +48,7 @@
                     </Setter.Value>
                 </Setter>
             </Trigger>
-            <Trigger Property="Tag" Value="Horizontal">
+            <Trigger Property="hc:ExpanderElement.HeaderTextOrientation" Value="Horizontal">
                 <Setter TargetName="HeaderText" Property="LayoutTransform">
                     <Setter.Value>
                         <RotateTransform Angle="90" />
@@ -120,7 +120,7 @@
             <Trigger Property="IsEnabled" Value="false">
                 <Setter Property="Opacity" Value=".4" />
             </Trigger>
-            <Trigger Property="Tag" Value="Vertical">
+            <Trigger Property="hc:ExpanderElement.HeaderTextOrientation" Value="Vertical">
                 <Setter TargetName="HeaderText" Property="LayoutTransform">
                     <Setter.Value>
                         <RotateTransform Angle="90" />
@@ -134,7 +134,7 @@
                     </Setter.Value>
                 </Setter>
             </Trigger>
-            <Trigger Property="Tag" Value="Horizontal">
+            <Trigger Property="hc:ExpanderElement.HeaderTextOrientation" Value="Horizontal">
                 <Setter TargetName="HeaderText" Property="LayoutTransform">
                     <Setter.Value>
                         <RotateTransform Angle="90" />