From 5b0f3d6e2fa1af20dd279f8f1f72f282377035a5 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Fri, 10 May 2019 21:55:31 +0800
Subject: [PATCH] modified tabcontrol style

---
 .../Controls/TabControlDemoCtl.xaml           |   4 +-
 .../Controls/Other/ScrollViewer.cs            |  23 +--
 .../Controls/TabControl/TabControl.cs         | 171 ++++++++++-------
 .../Themes/Styles/TabControl.xaml             | 180 +++++++++---------
 4 files changed, 201 insertions(+), 177 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
index 5c54ea23..1bcd6060 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
@@ -7,7 +7,7 @@
         <controls:ScrollViewer HorizontalScrollBarVisibility="Auto">
             <StackPanel>
                 <Label Style="{StaticResource LabelPrimary}" Content="Default" Margin="32,32,0,0" HorizontalAlignment="Left"/>
-                <controls:TabControl Margin="32,16,32,0" Width="800" Height="300">
+                <controls:TabControl Margin="32,16,32,0" Width="800" Height="300" IsScrollable="True">
                     <controls:TabItem Header="TabItem1">
                         <controls:SimplePanel Background="White"/>
                     </controls:TabItem>
@@ -36,7 +36,7 @@
                     <Label Style="{StaticResource LabelPrimary}" Margin="16,0,0,0" Content="IsDraggable = True"/>
                     <Label Style="{StaticResource LabelPrimary}" Margin="16,0,0,0" Content="IsEnableAnimation = True"/>
                 </StackPanel>
-                <controls:TabControl IsEnableAnimation="True" ShowCloseButton="True" IsDraggable="True" IsEnableTabFill="True" Margin="32,0,32,32" Width="800" Height="300">
+                <controls:TabControl IsScrollable="True" IsEnableAnimation="True" ShowCloseButton="True" IsDraggable="True" Margin="32,0,32,32" Width="800" Height="300">
                     <controls:TabItem Header="TabItem1">
                         <controls:SimplePanel Background="White"/>
                     </controls:TabItem>
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs b/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs
index 39cb98da..a6734670 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs
@@ -17,8 +17,6 @@ namespace HandyControl.Controls
 
         private bool _isRunning;
 
-        private Storyboard _scrollingAnimation = new Storyboard();
-
         /// <summary>
         ///     滚动方向
         /// </summary>
@@ -30,7 +28,7 @@ namespace HandyControl.Controls
         /// </summary>
         public Orientation Orientation
         {
-            get => (Orientation)GetValue(OrientationProperty);
+            get => (Orientation) GetValue(OrientationProperty);
             set => SetValue(OrientationProperty, value);
         }
 
@@ -45,7 +43,7 @@ namespace HandyControl.Controls
         /// </summary>
         public bool CanMouseWheel
         {
-            get => (bool)GetValue(CanMouseWheelProperty);
+            get => (bool) GetValue(CanMouseWheelProperty);
             set => SetValue(CanMouseWheelProperty, value);
         }
 
@@ -103,7 +101,7 @@ namespace HandyControl.Controls
         }
 
         internal void ScrollToVerticalOffsetInternal(double offset, double milliseconds = 500)
-        {          
+        {
             var animation = AnimationHelper.CreateAnimation(offset, milliseconds);
             animation.EasingFunction = new CubicEase
             {
@@ -117,10 +115,7 @@ namespace HandyControl.Controls
             };
             _isRunning = true;
 
-            _scrollingAnimation.Children.Add(animation);
-            BeginStoryboard(_scrollingAnimation);
-
-            //BeginAnimation(CurrentVerticalOffsetProperty, animation);
+            BeginAnimation(CurrentVerticalOffsetProperty, animation, HandoffBehavior.Compose);
         }
 
         internal void ScrollToHorizontalOffsetInternal(double offset, double milliseconds = 500)
@@ -165,7 +160,7 @@ namespace HandyControl.Controls
         /// </summary>
         public bool IsEnableInertia
         {
-            get => (bool)GetValue(IsEnableInertiaProperty);
+            get => (bool) GetValue(IsEnableInertiaProperty);
             set => SetValue(IsEnableInertiaProperty, value);
         }
 
@@ -180,7 +175,7 @@ namespace HandyControl.Controls
         /// </summary>
         public bool IsPenetrating
         {
-            get => (bool)GetValue(IsPenetratingProperty);
+            get => (bool) GetValue(IsPenetratingProperty);
             set => SetValue(IsPenetratingProperty, value);
         }
 
@@ -191,7 +186,7 @@ namespace HandyControl.Controls
 
         public static bool GetIsPenetrating(DependencyObject element)
         {
-            return (bool)element.GetValue(IsPenetratingProperty);
+            return (bool) element.GetValue(IsPenetratingProperty);
         }
 
         /// <summary>
@@ -214,7 +209,7 @@ namespace HandyControl.Controls
         private double CurrentVerticalOffset
         {
             // ReSharper disable once UnusedMember.Local
-            get => (double)GetValue(CurrentVerticalOffsetProperty);
+            get => (double) GetValue(CurrentVerticalOffsetProperty);
             set => SetValue(CurrentVerticalOffsetProperty, value);
         }
 
@@ -237,7 +232,7 @@ namespace HandyControl.Controls
         /// </summary>
         public double CurrentHorizontalOffset
         {
-            get => (double)GetValue(CurrentHorizontalOffsetProperty);
+            get => (double) GetValue(CurrentHorizontalOffsetProperty);
             set => SetValue(CurrentHorizontalOffsetProperty, value);
         }
     }
diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs
index 15e347d9..aac5c5be 100644
--- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs
@@ -11,8 +11,8 @@ namespace HandyControl.Controls
     [TemplatePart(Name = OverflowButtonKey, Type = typeof(ContextMenuToggleButton))]
     [TemplatePart(Name = HeaderPanelKey, Type = typeof(TabPanel))]
     [TemplatePart(Name = OverflowScrollviewer, Type = typeof(ScrollViewer))]
-    [TemplatePart(Name = OverflowButtonLeft, Type = typeof(Button))]
-    [TemplatePart(Name = OverflowButtonRight, Type = typeof(Button))]
+    [TemplatePart(Name = ScrollButtonLeft, Type = typeof(Button))]
+    [TemplatePart(Name = ScrollButtonRight, Type = typeof(Button))]
     public class TabControl : System.Windows.Controls.TabControl
     {
         private const string OverflowButtonKey = "PART_OverflowButton";
@@ -21,9 +21,9 @@ namespace HandyControl.Controls
 
         private const string OverflowScrollviewer = "PART_OverflowScrollviewer";
 
-        private const string OverflowButtonLeft = "PART_OverflowButtonLeft";
+        private const string ScrollButtonLeft = "PART_ScrollButtonLeft";
 
-        private const string OverflowButtonRight = "PART_OverflowButtonRight";
+        private const string ScrollButtonRight = "PART_ScrollButtonRight";
 
         private ContextMenuToggleButton _buttonOverflow;
 
@@ -31,9 +31,9 @@ namespace HandyControl.Controls
 
         private ScrollViewer _scrollviewerOverflow;
 
-        private Button _buttonOverflowLeft;
+        private Button _buttonScrollLeft;
 
-        private Button _buttonOverflowRight;
+        private Button _buttonScrollRight;
 
         /// <summary>
         ///     是否为内部操作
@@ -130,16 +130,21 @@ namespace HandyControl.Controls
             set => SetValue(TabItemHeightProperty, value);
         }
 
-        //TODO: Implement this 
+        /// <summary>
+        ///     是否可以滚动
+        /// </summary>
+        public static readonly DependencyProperty IsScrollableProperty = DependencyProperty.Register(
+            "IsScrollable", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
+
+        /// <summary>
+        ///     是否可以滚动
+        /// </summary>
         public bool IsScrollable
         {
-            get { return (bool)GetValue(IsScrollableProperty); }
-            set { SetValue(IsScrollableProperty, value); }
+            get => (bool) GetValue(IsScrollableProperty);
+            set => SetValue(IsScrollableProperty, value);
         }
 
-        public static readonly DependencyProperty IsScrollableProperty =
-            DependencyProperty.Register("IsScrollable", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
-
         /// <summary>
         ///     可见的标签数量
         /// </summary>
@@ -188,6 +193,20 @@ namespace HandyControl.Controls
 
         public override void OnApplyTemplate()
         {
+            if (_buttonOverflow != null)
+            {
+                if (_buttonOverflow.Menu != null)
+                {
+                    _buttonOverflow.Menu.Closed -= Menu_Closed;
+                    _buttonOverflow.Menu = null;
+                }
+
+                _buttonOverflow.Click -= ButtonOverflow_Click;
+            }
+
+            if (_buttonScrollLeft != null) _buttonScrollLeft.Click -= ButtonScrollLeft_Click;
+            if (_buttonScrollRight != null) _buttonScrollRight.Click -= ButtonScrollRight_Click;
+
             base.OnApplyTemplate();
             _headerPanel = Template.FindName(HeaderPanelKey, this) as TabPanel;
 
@@ -195,31 +214,11 @@ namespace HandyControl.Controls
 
             _buttonOverflow = Template.FindName(OverflowButtonKey, this) as ContextMenuToggleButton;
             _scrollviewerOverflow = Template.FindName(OverflowScrollviewer, this) as ScrollViewer;
-            _buttonOverflowLeft = Template.FindName(OverflowButtonLeft, this) as Button;
-            _buttonOverflowRight = Template.FindName(OverflowButtonRight, this) as Button;
+            _buttonScrollLeft = Template.FindName(ScrollButtonLeft, this) as Button;
+            _buttonScrollRight = Template.FindName(ScrollButtonRight, this) as Button;
 
-            _buttonOverflowLeft.Click += (s, e) =>
-            {
-                var currentOffset = _scrollviewerOverflow.CurrentHorizontalOffset;
-                var modulo = (currentOffset % TabItemWidth);
-                var offset = currentOffset - (modulo == 0 ? TabItemWidth : modulo);
-
-                if (offset >= 0)
-                {
-                    _scrollviewerOverflow.ScrollToHorizontalOffsetInternal(offset);
-                }                  
-            };
-
-            _buttonOverflowRight.Click += (s, e) =>
-            {
-                var currentOffset = _scrollviewerOverflow.CurrentHorizontalOffset;
-                var offset = currentOffset + (TabItemWidth - (currentOffset % TabItemWidth));           
-
-                if(offset <= _scrollviewerOverflow.ScrollableWidth)
-                {
-                    _scrollviewerOverflow.ScrollToHorizontalOffsetInternal(offset);
-                }                  
-            };
+            if (_buttonScrollLeft != null) _buttonScrollLeft.Click += ButtonScrollLeft_Click;
+            if (_buttonScrollRight != null) _buttonScrollRight.Click += ButtonScrollRight_Click;
 
             if (_buttonOverflow != null)
             {
@@ -231,48 +230,78 @@ namespace HandyControl.Controls
                     Placement = PlacementMode.Bottom,
                     PlacementTarget = _buttonOverflow
                 };
-                menu.Closed += (s, e) => _buttonOverflow.IsChecked = false;
+                menu.Closed += Menu_Closed;
                 _buttonOverflow.Menu = menu;
-                _buttonOverflow.Click += (s, e) =>
+                _buttonOverflow.Click += ButtonOverflow_Click;
+            }
+        }
+
+        private void Menu_Closed(object sender, RoutedEventArgs e)
+        {
+            _buttonOverflow.IsChecked = false;
+        }
+
+        private void ButtonScrollRight_Click(object sender, RoutedEventArgs e)
+        {
+            var currentOffset = _scrollviewerOverflow.CurrentHorizontalOffset;
+            var offset = currentOffset + (TabItemWidth - currentOffset % TabItemWidth);
+
+            if (offset <= _scrollviewerOverflow.ScrollableWidth)
+            {
+                _scrollviewerOverflow.ScrollToHorizontalOffsetInternal(offset);
+            }
+        }
+
+        private void ButtonScrollLeft_Click(object sender, RoutedEventArgs e)
+        {
+            var currentOffset = _scrollviewerOverflow.CurrentHorizontalOffset;
+            var modulo = currentOffset % TabItemWidth;
+            var offset = currentOffset - (modulo < 1e-6 ? TabItemWidth : modulo);
+
+            if (offset >= 0)
+            {
+                _scrollviewerOverflow.ScrollToHorizontalOffsetInternal(offset);
+            }
+        }
+
+        private void ButtonOverflow_Click(object sender, RoutedEventArgs e)
+        {
+            if (_buttonOverflow.IsChecked == true)
+            {
+                _buttonOverflow.Menu.Items.Clear();
+                foreach (TabItem item in Items)
                 {
-                    if (_buttonOverflow.IsChecked == true)
+                    var menuItem = new MenuItem
                     {
-                        _buttonOverflow.Menu.Items.Clear();
-                        foreach (TabItem item in Items)
+                        Header = item.Header,
+                        Width = TabItemWidth,
+                        IsChecked = item.IsSelected,
+                        IsCheckable = true
+                    };
+                    menuItem.Click += delegate
+                    {
+                        _buttonOverflow.IsChecked = false;
+                        var index = Items.IndexOf(item);
+                        if (index >= _itemShowCount)
                         {
-                            var menuItem = new MenuItem
+                            Items.Remove(item);
+                            Items.Insert(0, item);
+                            if (IsEnableAnimation)
                             {
-                                Header = item.Header,
-                                Width = TabItemWidth,
-                                IsChecked = item.IsSelected,
-                                IsCheckable = true
-                            };
-                            menuItem.Click += delegate
+                                _headerPanel.ClearValue(TabPanel.FluidMoveDurationProperty);
+                            }
+                            else
                             {
-                                _buttonOverflow.IsChecked = false;
-                                var index = Items.IndexOf(item);
-                                if (index >= _itemShowCount)
-                                {
-                                    Items.Remove(item);
-                                    Items.Insert(0, item);
-                                    if (IsEnableAnimation)
-                                    {
-                                        _headerPanel.ClearValue(TabPanel.FluidMoveDurationProperty);
-                                    }
-                                    else
-                                    {
-                                        _headerPanel.FluidMoveDuration = new Duration(TimeSpan.FromSeconds(0));
-                                    }
-                                    _headerPanel.ForceUpdate = true;
-                                    _headerPanel.Measure(new Size(_headerPanel.DesiredSize.Width, ActualHeight));
-                                    _headerPanel.ForceUpdate = false;
-                                }
-                                item.IsSelected = true;
-                            };
-                            _buttonOverflow.Menu.Items.Add(menuItem);
+                                _headerPanel.FluidMoveDuration = new Duration(TimeSpan.FromSeconds(0));
+                            }
+                            _headerPanel.ForceUpdate = true;
+                            _headerPanel.Measure(new Size(_headerPanel.DesiredSize.Width, ActualHeight));
+                            _headerPanel.ForceUpdate = false;
                         }
-                    }
-                };
+                        item.IsSelected = true;
+                    };
+                    _buttonOverflow.Menu.Items.Add(menuItem);
+                }
             }
         }
     }
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
index 583d6614..3214908e 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/TabControl.xaml
@@ -71,6 +71,90 @@
         </Setter>
     </Style>
 
+    <ControlTemplate x:Key="TabControlPlusTemplate" TargetType="controls:TabControl">
+        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+            <Grid x:Name="templateRoot" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition x:Name="ColumnDefinition0"/>
+                    <ColumnDefinition x:Name="ColumnDefinition1" Width="0"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition x:Name="RowDefinition0" Height="Auto"/>
+                    <RowDefinition x:Name="RowDefinition1" Height="*"/>
+                </Grid.RowDefinitions>
+                <Border Background="{TemplateBinding Background}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}">
+                    <controls:TabPanel MinHeight="{TemplateBinding TabItemHeight}" TabItemHeight="{TemplateBinding TabItemHeight}" TabItemWidth="{TemplateBinding TabItemWidth}" IsEnableTabFill="{TemplateBinding IsEnableTabFill}" Margin="0,0,-1,-1" x:Name="PART_HeaderPanel" HorizontalAlignment="Left" Background="{DynamicResource SecondaryTextBrush}" IsItemsHost="true" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1">
+                        <interactivity:Interaction.Behaviors>
+                            <interactivity:FluidMoveBehavior AppliesTo="Children" Duration="{Binding FluidMoveDuration,ElementName=PART_HeaderPanel}">
+                                <interactivity:FluidMoveBehavior.EaseX>
+                                    <CubicEase EasingMode="EaseOut"/>
+                                </interactivity:FluidMoveBehavior.EaseX>
+                            </interactivity:FluidMoveBehavior>
+                        </interactivity:Interaction.Behaviors>
+                    </controls:TabPanel>
+                </Border>
+                <Border x:Name="contentPanel" Background="{DynamicResource SecondaryRegionBrush}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
+                    <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                </Border>
+                <Border Visibility="{Binding Visibility,ElementName=PART_OverflowButton}" Margin="0,-1,0,0" Grid.Row="0" Grid.Column="0" BorderThickness="1,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Right">
+                    <controls:ContextMenuToggleButton x:Name="PART_OverflowButton" Visibility="Collapsed" Style="{StaticResource ToggleButtonIconTransparent}" controls:IconSwitchElement.Geometry="{StaticResource DownGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}"/>
+                </Border>
+            </Grid>
+        </Border>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="TabControlPlusScrollableTemplate" TargetType="controls:TabControl">
+        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+            <Grid x:Name="templateRoot" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition x:Name="ColumnDefinition0"/>
+                    <ColumnDefinition x:Name="ColumnDefinition1" Width="0"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition x:Name="RowDefinition0" Height="Auto"/>
+                    <RowDefinition x:Name="RowDefinition1" Height="*"/>
+                </Grid.RowDefinitions>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Border Visibility="{Binding Visibility,ElementName=PART_OverflowButton}" Margin="0,-1,0,0" Grid.Row="0" Grid.Column="0" BorderThickness="0,0,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Left" Panel.ZIndex="2">
+                        <Border.CacheMode>
+                            <BitmapCache SnapsToDevicePixels="True"/>
+                        </Border.CacheMode>
+                        <Button Style="{StaticResource ButtonIcon}" Padding="8" controls:IconElement.Geometry="{StaticResource LeftGeometry}" Foreground="{DynamicResource PrimaryTextBrush}" Background="{DynamicResource SecondaryRegionBrush}" x:Name="PART_ScrollButtonLeft"/>
+                    </Border>
+                    <controls:ScrollViewer HorizontalScrollBarVisibility="Hidden" CanMouseWheel="True" Orientation="Horizontal" IsEnableInertia="True" Grid.Column="1" IsDeferredScrollingEnabled="True" x:Name="PART_OverflowScrollviewer">
+                        <Border Background="{TemplateBinding Background}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}" >
+                            <controls:TabPanel MinHeight="{TemplateBinding TabItemHeight}" TabItemHeight="{TemplateBinding TabItemHeight}" TabItemWidth="{TemplateBinding TabItemWidth}" IsEnableTabFill="{TemplateBinding IsEnableTabFill}" Margin="0,0,-1,-1" x:Name="PART_HeaderPanel" HorizontalAlignment="Left" Background="{DynamicResource SecondaryTextBrush}" IsItemsHost="true" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1">
+                                <interactivity:Interaction.Behaviors>
+                                    <interactivity:FluidMoveBehavior AppliesTo="Children" Duration="{Binding FluidMoveDuration,ElementName=PART_HeaderPanel}">
+                                        <interactivity:FluidMoveBehavior.EaseX>
+                                            <CubicEase EasingMode="EaseOut"/>
+                                        </interactivity:FluidMoveBehavior.EaseX>
+                                    </interactivity:FluidMoveBehavior>
+                                </interactivity:Interaction.Behaviors>
+                            </controls:TabPanel>
+                        </Border>
+                    </controls:ScrollViewer>
+                </Grid>
+                <Border Visibility="{Binding Visibility,ElementName=PART_OverflowButton}" Margin="0,-1,0,0" Grid.Row="0" Grid.Column="0" BorderThickness="1,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Right">
+                    <Border.CacheMode>
+                        <BitmapCache SnapsToDevicePixels="True"/>
+                    </Border.CacheMode>
+                    <StackPanel Orientation="Horizontal">
+                        <Button Style="{StaticResource ButtonIcon}" BorderBrush="{DynamicResource BorderBrush}" Padding="8" BorderThickness="0,0,1,0" controls:IconElement.Geometry="{StaticResource RightGeometry}" Foreground="{DynamicResource PrimaryTextBrush}" Background="{DynamicResource SecondaryRegionBrush}" x:Name="PART_ScrollButtonRight"/>
+                        <controls:ContextMenuToggleButton x:Name="PART_OverflowButton" Visibility="Collapsed" Style="{StaticResource ToggleButtonIconTransparent}" controls:IconSwitchElement.Geometry="{StaticResource DownGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}"/>
+                    </StackPanel>
+                </Border>
+                <Border x:Name="contentPanel" Background="{DynamicResource SecondaryRegionBrush}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
+                    <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                </Border>
+            </Grid>
+        </Border>
+    </ControlTemplate>
+
     <Style TargetType="controls:TabControl">
         <Setter Property="Padding" Value="0"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
@@ -78,96 +162,12 @@
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="controls:TabControl">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-                        <Grid x:Name="templateRoot" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition x:Name="ColumnDefinition0"/>
-                                <ColumnDefinition x:Name="ColumnDefinition1" Width="0"/>
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition x:Name="RowDefinition0" Height="Auto"/>
-                                <RowDefinition x:Name="RowDefinition1" Height="*"/>
-                            </Grid.RowDefinitions>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="*"/>
-                                </Grid.ColumnDefinitions>
-
-                                <Border Visibility="{Binding Visibility,ElementName=PART_OverflowButton}" Margin="0,-1,0,0" Grid.Row="0" Grid.Column="0" 
-                                        BorderThickness="0,0,1,0" BorderBrush="{DynamicResource BorderBrush}" 
-                                        Background="{DynamicResource RegionBrush}" HorizontalAlignment="Left"
-                                        Panel.ZIndex="2">
-                                    <Border.CacheMode>
-                                        <BitmapCache SnapsToDevicePixels="True"/>
-                                    </Border.CacheMode>
-                                    <Border.Effect>
-                                        <DropShadowEffect Direction="-45" BlurRadius="25" 
-                                                          ShadowDepth="8" Opacity="0.5" 
-                                                          Color="{DynamicResource EffectShadowColor}"/>
-                                    </Border.Effect>
-
-                                    <Button Style="{DynamicResource ButtonIcon}" 
-                                        controls:IconElement.Geometry="{StaticResource LeftGeometry}"
-                                        Grid.Column="0"
-                                        Foreground="{DynamicResource PrimaryTextBrush}"
-                                        x:Name="PART_OverflowButtonLeft"
-                                        />
-                                </Border>
-
-                                <controls:ScrollViewer HorizontalScrollBarVisibility="Hidden" 
-                                                       CanMouseWheel="True" Orientation="Horizontal"
-                                                       IsEnableInertia="True" 
-                                                       Grid.Column="1"
-                                                       IsDeferredScrollingEnabled="True"
-                                                       x:Name="PART_OverflowScrollviewer">
-
-                                    <Border Background="{TemplateBinding Background}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}" >
-                                        <controls:TabPanel MinHeight="{TemplateBinding TabItemHeight}" TabItemHeight="{TemplateBinding TabItemHeight}" TabItemWidth="{TemplateBinding TabItemWidth}" IsEnableTabFill="{TemplateBinding IsEnableTabFill}" Margin="0,0,-1,-1" x:Name="PART_HeaderPanel" HorizontalAlignment="Left" Background="{DynamicResource SecondaryTextBrush}" IsItemsHost="true" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1">
-                                            <interactivity:Interaction.Behaviors>
-                                                <interactivity:FluidMoveBehavior AppliesTo="Children" Duration="{Binding FluidMoveDuration,ElementName=PART_HeaderPanel}">
-                                                    <interactivity:FluidMoveBehavior.EaseX>
-                                                        <CubicEase EasingMode="EaseOut"/>
-                                                    </interactivity:FluidMoveBehavior.EaseX>
-                                                </interactivity:FluidMoveBehavior>
-                                            </interactivity:Interaction.Behaviors>
-                                        </controls:TabPanel>
-                                    </Border>
-                                </controls:ScrollViewer>
-
-                            </Grid>
-                            <Border Visibility="{Binding Visibility,ElementName=PART_OverflowButton}" 
-                                    Margin="0,-1,0,0" Grid.Row="0" Grid.Column="0" BorderThickness="1,0,0,1" BorderBrush="{DynamicResource BorderBrush}" 
-                                    Background="{DynamicResource RegionBrush}" HorizontalAlignment="Right">
-                                <Border.Effect>
-                                    <DropShadowEffect Direction="-135" BlurRadius="25" 
-                                                      ShadowDepth="8" Opacity="0.5"
-                                                      Color="{DynamicResource EffectShadowColor}"/>
-                                </Border.Effect>
-                                <Border.CacheMode>
-                                    <BitmapCache SnapsToDevicePixels="True"/>
-                                </Border.CacheMode>
-                                <StackPanel Orientation="Horizontal">
-                                    <Button Style="{DynamicResource ButtonIcon}" 
-                                            controls:IconElement.Geometry="{StaticResource RightGeometry}"
-                                            Foreground="{DynamicResource PrimaryTextBrush}"
-                                            x:Name="PART_OverflowButtonRight"/>
-                                    <controls:ContextMenuToggleButton x:Name="PART_OverflowButton" Visibility="Collapsed" Style="{StaticResource ToggleButtonIconTransparent}" controls:IconSwitchElement.Geometry="{StaticResource DownGeometry}" controls:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}"/>
-                                </StackPanel>
-                            </Border>
-                            <Border x:Name="contentPanel" Background="{DynamicResource SecondaryRegionBrush}" 
-                                    Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local"
-                                     >
-                                <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                            </Border>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
+        <Setter Property="Template" Value="{StaticResource TabControlPlusTemplate}"/>
+        <Style.Triggers>
+            <Trigger Property="IsScrollable" Value="True">
+                <Setter Property="Template" Value="{StaticResource TabControlPlusScrollableTemplate}"/>
+            </Trigger>
+        </Style.Triggers>
     </Style>
 
     <Style BasedOn="{StaticResource TabControlBaseStyle}" TargetType="TabControl"/>