From 287bf7c6a267cfa39f474e686818b2ae67dac340 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Fri, 19 Apr 2019 23:31:17 +0800
Subject: [PATCH] modified TabItemStyle

---
 .../Styles/NativeTabControlDemoCtl.xaml            |  2 +-
 .../Themes/Styles/Base/TabControlBaseStyle.xaml    | 14 +++++---------
 .../Themes/Styles/TabControl.xaml                  |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml
index 5175fd13..9e55643a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml
@@ -7,7 +7,7 @@
     <controls:TransitioningContentControl>
         <ScrollViewer>
             <UniformGrid Rows="2" Columns="2" Margin="16">
-                <TabControl Margin="16" Width="400" Height="200">
+                <TabControl TabStripPlacement="Right" Margin="16" Width="400" Height="200">
                     <TabItem Header="{x:Static langs:Lang.Title}" HeaderStringFormat="{}{0}1">
                         <Border Background="{DynamicResource PrimaryBrush}">
                             <TextBlock Style="{StaticResource TextBlockLargeBold}" Foreground="{DynamicResource TextIconBrush}">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TabControlBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TabControlBaseStyle.xaml
index 406d4723..66c0ae97 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TabControlBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TabControlBaseStyle.xaml
@@ -14,7 +14,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
         <Setter Property="Margin" Value="0"/>
         <Setter Property="Padding" Value="10,6"/>
-        <Setter Property="Height" Value="30"/>
+        <Setter Property="MinHeight" Value="30"/>
         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
         <Setter Property="VerticalContentAlignment" Value="Stretch"/>
         <Setter Property="Template">
@@ -22,16 +22,12 @@
                 <ControlTemplate TargetType="TabItem">
                     <controls:SimplePanel x:Name="templateRoot" SnapsToDevicePixels="true">
                         <Border x:Name="mainBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" Background="{TemplateBinding Background}" Margin="0"/>
-                        <ContentPresenter x:Name="contentPresenter" TextElement.Foreground="{DynamicResource PrimaryTextBrush}" ContentSource="Header" Focusable="False" HorizontalAlignment="Center" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        <ContentPresenter x:Name="contentPresenter" TextElement.Foreground="{DynamicResource PrimaryTextBrush}" ContentSource="Header" Focusable="False" HorizontalAlignment="Center" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center"/>
                     </controls:SimplePanel>
                     <ControlTemplate.Triggers>
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="false"/>
-                                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Top"/>
-                            </MultiDataTrigger.Conditions>
+                        <Trigger Property="IsSelected" Value="False">
                             <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,0,0,0"/>
-                        </MultiDataTrigger>
+                        </Trigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true"/>
@@ -127,7 +123,7 @@
                             <Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
                             <Setter TargetName="contentPanel" Property="Grid.Column" Value="0" />
                             <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-                            <Setter TargetName="contentPanel" Property="BorderThickness" Value="0,0,0,1"/>
+                            <Setter TargetName="contentPanel" Property="BorderThickness" Value="0,0,1,0"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
index ebcbe174..586874ce 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
@@ -170,7 +170,7 @@
                             <Setter TargetName="ColumnDefinition1" Property="Width" Value="Auto" />
                             <Setter TargetName="contentPanel" Property="Grid.Column" Value="0" />
                             <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-                            <Setter TargetName="contentPanel" Property="BorderThickness" Value="0,0,0,1"/>
+                            <Setter TargetName="contentPanel" Property="BorderThickness" Value="0,0,1,0"/>
                             <Setter TargetName="headerPanel" Property="Grid.Column" Value="1" />
                             <Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
                             <Setter TargetName="headerPanel" Property="Rows" Value="0"/>