From 3feb946b47cbc6901d357b86d3e0db6bea3ef2fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 1 Dec 2024 21:50:14 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20issue=20=EF=BC=88#116=20=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix issue （#116 ）
---
 .../ExampleViews/BasicControlsExample.xaml    | 66 ++++++++++++---
 .../Core/Helpers/ElementHelper.cs             |  9 ++-
 .../Styles/Styles.TabControl.xaml             | 80 ++++++++++++++++---
 3 files changed, 132 insertions(+), 23 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
index b216fc5c..fccc5e44 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
@@ -779,32 +779,67 @@
                             <TabItem Padding="10" Header="TabItem1">
                                 <Rectangle Fill="{DynamicResource WD.DangerSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem2">
+                            <TabItem
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="TabItem2">
                                 <Rectangle Fill="{DynamicResource WD.InfoSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem3">
+                            <TabItem
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="TabItem3">
                                 <Rectangle Fill="{DynamicResource WD.WarningSolidColorBrush}" />
                             </TabItem>
                         </TabControl>
                         <TabControl Margin="4" TabStripPlacement="Bottom">
-                            <TabItem Padding="10" Header="TabItem1">
+                            <TabItem
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="1">
                                 <Rectangle Fill="{DynamicResource WD.InfoSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem2">
+                            <TabItem
+                                x:Name="MyTabItem"
+                                MaxWidth="120"
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="TabItem2LongLongLongLongLongLongLongLong"
+                                ToolTip="{Binding ElementName=MyTabItem, Path=Header}">
                                 <Rectangle Fill="{DynamicResource WD.DangerSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem3">
+                            <TabItem
+                                MaxWidth="120"
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True">
+                                <TabItem.Header>
+                                    <TextBlock
+                                        VerticalAlignment="Center"
+                                        Text="TabItem3LongLongLongLongLongLongLongLong"
+                                        TextTrimming="CharacterEllipsis"
+                                        TextWrapping="NoWrap"
+                                        ToolTip="{Binding Text, RelativeSource={RelativeSource Self}}" />
+                                </TabItem.Header>
                                 <Rectangle Fill="{DynamicResource WD.WarningSolidColorBrush}" />
                             </TabItem>
                         </TabControl>
                         <TabControl Margin="4" TabStripPlacement="Left">
-                            <TabItem Padding="10" Header="TabItem1">
+                            <TabItem
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="TabItem1">
                                 <Rectangle Fill="{DynamicResource WD.WarningSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem2">
+                            <TabItem
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="TabItem2">
                                 <Rectangle Fill="{DynamicResource WD.InfoSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem3">
+                            <TabItem
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="TabItem3">
                                 <Rectangle Fill="{DynamicResource WD.DangerSolidColorBrush}" />
                             </TabItem>
                         </TabControl>
@@ -812,13 +847,22 @@
                             Margin="4"
                             IsEnabled="False"
                             TabStripPlacement="Right">
-                            <TabItem Padding="10" Header="TabItem1">
+                            <TabItem
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="TabItem1">
                                 <Rectangle Fill="{DynamicResource WD.SuccessSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem2">
+                            <TabItem
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="TabItem2">
                                 <Rectangle Fill="{DynamicResource WD.InfoSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem3">
+                            <TabItem
+                                Padding="10"
+                                wd:ElementHelper.IsClear="True"
+                                Header="TabItem3">
                                 <Rectangle Fill="{DynamicResource WD.WarningSolidColorBrush}" />
                             </TabItem>
                         </TabControl>
diff --git a/src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs b/src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs
index f040e1ea..ea877d62 100644
--- a/src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs
+++ b/src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs
@@ -93,14 +93,17 @@ private static void ButtonClear_Click(object sender, RoutedEventArgs e)
             if (sender is Button button)
             {
                 if (button.TemplatedParent is TextBox textBox)
-                {
                     textBox.Clear();
-                }
                 else if (button.TemplatedParent is PasswordBox passwordBox)
-                {
                     passwordBox.Clear();
+                else if (button.TemplatedParent is TabItem tabItem)
+                {
+                    var tabControl = tabItem.Parent as TabControl;
+                    if (tabControl != null)
+                        tabControl.Items.Remove(tabItem); 
                 }
             }
         }
+        
     }
 }
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml b/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml
index 03820288..b0983557 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml
@@ -2,7 +2,8 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:WPFDevelopers.Controls"
-    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers">
+    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers"
+    xmlns:resx="clr-namespace:WPFDevelopers">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Themes/Basic/ControlBasic.xaml" />
         <ResourceDictionary Source="../Themes/Basic/Animations.xaml" />
@@ -19,15 +20,52 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabItem}">
-                    <controls:SmallPanel Background="{TemplateBinding Background}">
+                    <controls:SmallPanel
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
+                        Background="{TemplateBinding Background}">
                         <Border x:Name="PART_Border" BorderThickness="{TemplateBinding BorderThickness}" />
-                        <ContentPresenter
-                            x:Name="PART_ContentPresenter"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalAlignment="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                            VerticalAlignment="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                            ContentSource="Header"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <ContentPresenter
+                                x:Name="PART_ContentPresenter"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                VerticalAlignment="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                ContentSource="Header"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <Button
+                                x:Name="PART_CloseButton"
+                                Grid.Column="1"
+                                Width="20"
+                                Height="20"
+                                Margin="0,0,4,0"
+                                helpers:ElementHelper.CornerRadius="4"
+                                helpers:ElementHelper.IsClear="{Binding Path=(helpers:ElementHelper.IsClear), RelativeSource={RelativeSource TemplatedParent}}"
+                                Style="{StaticResource WD.NormalButton}"
+                                ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}"
+                                Visibility="Collapsed">
+                                <controls:PathIcon
+                                    Width="10"
+                                    Height="10"
+                                    Foreground="{DynamicResource WD.SecondaryTextSolidColorBrush}"
+                                    Kind="WindowClose" />
+                            </Button>
+                        </Grid>
+                        <!--<Line
+                            x:Name="PART_Line"
+                            Margin="{TemplateBinding Margin}"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Stroke="{DynamicResource WD.SecondaryTextSolidColorBrush}"
+                            StrokeThickness="1"
+                            X1="2"
+                            X2="2"
+                            Y1="0"
+                            Y2="15" />-->
                     </controls:SmallPanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsSelected" Value="True">
@@ -38,6 +76,28 @@
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
                         </Trigger>
+                        <Trigger Property="helpers:ElementHelper.IsClear" Value="True">
+                            <Setter TargetName="PART_CloseButton" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <!--<Trigger Property="TabStripPlacement" Value="Left">
+                            <Setter TargetName="PART_Line" Property="X1" Value="0" />
+                            <Setter TargetName="PART_Line" Property="X2" Value="15" />
+                            <Setter TargetName="PART_Line" Property="Y1" Value="2" />
+                            <Setter TargetName="PART_Line" Property="Y2" Value="2" />
+                            <Setter TargetName="PART_Line" Property="VerticalAlignment" Value="Bottom" />
+                            <Setter TargetName="PART_Line" Property="HorizontalAlignment" Value="Center" />
+                        </Trigger>
+                        <Trigger Property="TabStripPlacement" Value="Right">
+                            <Setter TargetName="PART_Line" Property="X1" Value="0" />
+                            <Setter TargetName="PART_Line" Property="X2" Value="15" />
+                            <Setter TargetName="PART_Line" Property="Y1" Value="2" />
+                            <Setter TargetName="PART_Line" Property="Y2" Value="2" />
+                            <Setter TargetName="PART_Line" Property="VerticalAlignment" Value="Bottom" />
+                            <Setter TargetName="PART_Line" Property="HorizontalAlignment" Value="Center" />
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="PART_Line" Property="Visibility" Value="Collapsed" />
+                        </Trigger>-->
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
@@ -85,6 +145,8 @@
                 <ControlTemplate TargetType="{x:Type TabControl}">
                     <controls:WDBorder
                         x:Name="PART_Border"
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
                         Margin="{TemplateBinding Margin}"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"