(GH-3587) Add style MahApps.Styles.TabControl.Animated

MahApps · May 16, 2020 · ced50d5 · ced50d5
1 parent ea63612
commit ced50d5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 24 deletions.
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TabControlExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TabControlExamples.xaml
@@ -144,14 +144,11 @@
                 </TabControl>
 
                 <Label Margin="0 5 0 0"
-                       Content="Default TabControl with _AnimatedTabControl style"
+                       Content="Default TabControl with MahApps.Styles.TabControl.Animated"
                        Style="{DynamicResource DescriptionHeaderStyle}" />
                 <ContentControl DataContext="{Binding ElementName=AnimatedTabControl}" Template="{StaticResource TabControlConfigDataTemplate}" />
                 <Grid>
-                    <Grid.Resources>
-                        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedTabControl.xaml" />
-                    </Grid.Resources>
-                    <TabControl x:Name="AnimatedTabControl" Height="150">
+                    <TabControl x:Name="AnimatedTabControl" Height="150" Style="{DynamicResource MahApps.Styles.TabControl.Animated}">
                         <TabItem Header="this tabcontrol">
                             <TextBlock FontSize="30" Text="Cool transition" />
                         </TabItem>
@@ -165,7 +162,7 @@
                 </Grid>
 
                 <Label Margin="0 5 0 0"
-                       Content="Default TabControl with Animated_SingleRowTabControl style"
+                       Content="Default TabControl with MahApps.Styles.TabControl.AnimatedSingleRow"
                        Style="{DynamicResource DescriptionHeaderStyle}" />
                 <ContentControl DataContext="{Binding ElementName=AnimatedSingleRowTabControl}" Template="{StaticResource TabControlConfigDataTemplate}" />
                 <Grid>

diff --git a/src/MahApps.Metro/Styles/Controls.AnimatedTabControl.xaml b/src/MahApps.Metro/Styles/Controls.AnimatedTabControl.xaml
@@ -1,14 +1,14 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Behaviors="clr-namespace:MahApps.Metro.Behaviors"
-                    xmlns:Controls="clr-namespace:MahApps.Metro.Controls">
+                    xmlns:behaviors="clr-namespace:MahApps.Metro.Behaviors"
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TabControl.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style BasedOn="{StaticResource MahApps.Styles.TabControl}" TargetType="{x:Type TabControl}">
-        <Setter Property="Controls:TabControlHelper.Transition" Value="Left" />
+    <Style x:Key="MahApps.Styles.TabControl.Animated" BasedOn="{StaticResource MahApps.Styles.TabControl}" TargetType="{x:Type TabControl}">
+        <Setter Property="mah:TabControlHelper.Transition" Value="Left" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabControl}">
@@ -25,9 +25,9 @@
                               Grid.Row="0"
                               Grid.Column="0"
                               Panel.ZIndex="1">
-                            <Controls:Underline x:Name="Underline"
+                            <mah:Underline x:Name="Underline"
                                                 Background="Transparent"
-                                                BorderBrush="{TemplateBinding Controls:TabControlHelper.UnderlineBrush}"
+                                                BorderBrush="{TemplateBinding mah:TabControlHelper.UnderlineBrush}"
                                                 LineThickness="1"
                                                 Placement="Bottom"
                                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
@@ -47,20 +47,20 @@
                                 KeyboardNavigation.TabIndex="2"
                                 KeyboardNavigation.TabNavigation="Local"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                            <Controls:TransitioningContentControl Behaviors:ReloadBehavior.OnSelectedTabChanged="True"
+                            <mah:TransitioningContentControl behaviors:ReloadBehavior.OnSelectedTabChanged="True"
                                                                   RestartTransitionOnContentChange="True"
-                                                                  Transition="{TemplateBinding Controls:TabControlHelper.Transition}"
+                                                                  Transition="{TemplateBinding mah:TabControlHelper.Transition}"
                                                                   UseLayoutRounding="True">
                                 <ContentPresenter x:Name="PART_SelectedContentHost"
                                                   Margin="{TemplateBinding Padding}"
                                                   ContentSource="SelectedContent"
                                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                                                   UseLayoutRounding="False" />
-                            </Controls:TransitioningContentControl>
+                            </mah:TransitioningContentControl>
                         </Border>
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="Controls:TabControlHelper.Underlined" Value="TabPanel">
+                        <Trigger Property="mah:TabControlHelper.Underlined" Value="TabPanel">
                             <Setter TargetName="Underline" Property="Visibility" Value="Visible" />
                         </Trigger>
                         <Trigger Property="TabStripPlacement" Value="Bottom">

diff --git a/src/MahApps.Metro/Styles/Controls.xaml b/src/MahApps.Metro/Styles/Controls.xaml
@@ -27,6 +27,7 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/FlatSlider.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TabControl.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedSingleRowTabControl.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedTabControl.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TextBlock.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.TextBox.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Label.xaml" />

diff --git a/src/Mahapps.Metro.Tests/Views/AnimatedTabControlWindow.xaml b/src/Mahapps.Metro.Tests/Views/AnimatedTabControlWindow.xaml
@@ -38,14 +38,10 @@
         <controls:MetroAnimatedTabControl x:Name="MetroTabControl2"
                                           ContentTemplateSelector="{StaticResource TabControlContentTemplateSelector}"
                                           ItemsSource="{Binding Data.TestViewModels}" />
-        <Grid>
-            <Grid.Resources>
-                <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedTabControl.xaml" />
-            </Grid.Resources>
-            <TabControl x:Name="NormalTabControl2"
-                        ContentTemplateSelector="{StaticResource TabControlContentTemplateSelector}"
-                        ItemsSource="{Binding Data.TestViewModels}" />
-        </Grid>
+        <TabControl x:Name="NormalTabControl2"
+                    Style="{DynamicResource MahApps.Styles.TabControl.Animated}"
+                    ContentTemplateSelector="{StaticResource TabControlContentTemplateSelector}"
+                    ItemsSource="{Binding Data.TestViewModels}" />
     </UniformGrid>
 
 </controls:MetroWindow>