Merge pull request #3796 from MahApps/feature/StylesTemplatesLastOne

(GH-3587) Last changes to Styles, Themes and Templates
MahApps · May 19, 2020 · dec2f65 · dec2f65
2 parents 9b2b671 + 60d798a
commit dec2f65
Show file tree

Hide file tree

Showing 82 changed files with 2,326 additions and 1,965 deletions.
diff --git a/XamlStyler/Options/MahApps.Metro.XAMLStyler.json b/XamlStyler/Options/MahApps.Metro.XAMLStyler.json
@@ -34,7 +34,7 @@
     "ReorderCanvasChildren": false,
     "ReorderSetters": 3,
     "FormatMarkupExtension": true,
-    "NoNewLineMarkupExtensions": "x:Bind, Binding, TemplateBinding, x:Static, DynamicResource, ComponentResourceKey",
+    "NoNewLineMarkupExtensions": "x:Bind, Binding, TemplateBinding, x:Static, DynamicResource, ComponentResourceKey, iconPacks:Modern, iconPacks:Material",
     "ThicknessSeparator": 1,
     "ThicknessAttributes": "Margin, Padding, BorderThickness, ThumbnailClipMargin",
     "FormatOnSave": false,

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Resources/Theme1.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/Resources/Theme1.xaml
@@ -2,8 +2,8 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.FlatButton.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Crimson.xaml" />
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/FlatButton.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml
@@ -25,17 +25,22 @@
             </Style>
 
             <!--  quick change of the collapse storyboard duration  -->
-            <Storyboard x:Key="MahApps.Storyboard.ExpanderCollapse">
+            <Storyboard x:Key="MahApps.Storyboard.Expander.Collapse.Fast">
                 <DoubleAnimation Storyboard.TargetName="ExpandSite"
                                  Storyboard.TargetProperty="(UIElement.Opacity)"
+                                 From="1"
                                  To="0"
                                  Duration="0:0:0.1" />
                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandSite" Storyboard.TargetProperty="(UIElement.Visibility)">
                     <DiscreteObjectKeyFrame KeyTime="0:0:0.1" Value="{x:Static Visibility.Collapsed}" />
                 </ObjectAnimationUsingKeyFrames>
             </Storyboard>
 
-            <Style TargetType="controls:MetroHeader" x:Key="MahApps.Styles.MetroHeader.Horizontal">
+            <Style BasedOn="{StaticResource MahApps.Styles.Expander}" TargetType="{x:Type Expander}">
+                <Setter Property="controls:ExpanderHelper.CollapseStoryboard" Value="{StaticResource MahApps.Storyboard.Expander.Collapse.Fast}" />
+            </Style>
+
+            <Style x:Key="MahApps.Styles.MetroHeader.Horizontal" TargetType="controls:MetroHeader">
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="controls:MetroHeader">
@@ -44,26 +49,41 @@
                                     <ColumnDefinition Width="Auto" SharedSizeGroup="HeaderGroup" />
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
-
-                                <ContentPresenter Content="{TemplateBinding Header}"
-                                                  ContentStringFormat="{TemplateBinding HeaderStringFormat}"
-                                                  ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                                  ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                                  Grid.Column="0"
-                                                  VerticalAlignment="Center" />
-                                <ContentPresenter Content="{TemplateBinding Content}"
-                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                  Grid.Column="1"
-                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+                                <Grid Grid.Column="0" Background="{TemplateBinding controls:HeaderedControlHelper.HeaderBackground}">
+                                    <controls:ContentControlEx x:Name="PART_Header"
+                                                               Margin="{TemplateBinding controls:HeaderedControlHelper.HeaderMargin}"
+                                                               HorizontalAlignment="{TemplateBinding controls:HeaderedControlHelper.HeaderHorizontalContentAlignment}"
+                                                               VerticalAlignment="{TemplateBinding controls:HeaderedControlHelper.HeaderVerticalContentAlignment}"
+                                                               Content="{TemplateBinding Header}"
+                                                               ContentCharacterCasing="{TemplateBinding controls:ControlsHelper.ContentCharacterCasing}"
+                                                               ContentStringFormat="{TemplateBinding HeaderStringFormat}"
+                                                               ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                                               ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+                                                               FontFamily="{TemplateBinding controls:HeaderedControlHelper.HeaderFontFamily}"
+                                                               FontSize="{TemplateBinding controls:HeaderedControlHelper.HeaderFontSize}"
+                                                               FontStretch="{TemplateBinding controls:HeaderedControlHelper.HeaderFontStretch}"
+                                                               FontWeight="{TemplateBinding controls:HeaderedControlHelper.HeaderFontWeight}"
+                                                               Foreground="{TemplateBinding controls:HeaderedControlHelper.HeaderForeground}"
+                                                               IsTabStop="False"
+                                                               RecognizesAccessKey="{TemplateBinding controls:ControlsHelper.RecognizesAccessKey}"
+                                                               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                </Grid>
+                                <Grid Grid.Column="1" Background="{TemplateBinding Background}">
+                                    <ContentPresenter x:Name="PART_Content"
+                                                      Margin="{TemplateBinding Padding}"
+                                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                      ContentSource="Content"
+                                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                </Grid>
                             </Grid>
                         </ControlTemplate>
                     </Setter.Value>
                 </Setter>
+                <Setter Property="controls:HeaderedControlHelper.HeaderMargin" Value="0 0 4 0" />
+                <Setter Property="controls:HeaderedControlHelper.HeaderVerticalContentAlignment" Value="Center" />
             </Style>
-            
+
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -72,7 +72,7 @@
             <Button Width="100"
                     Margin="{StaticResource ControlMargin}"
                     Content="Enabled"
-                    Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}" />
+                    Style="{DynamicResource MahApps.Styles.Button.Square.Accent}" />
             <Button Width="100"
                     Margin="{StaticResource ControlMargin}"
                     Content="Disabled"
@@ -82,7 +82,7 @@
                     Margin="{StaticResource ControlMargin}"
                     Content="Disabled"
                     IsEnabled="False"
-                    Style="{DynamicResource MahApps.Styles.Button.AccentedSquare}" />
+                    Style="{DynamicResource MahApps.Styles.Button.Square.Accent}" />
         </StackPanel>
 
         <StackPanel Grid.Row="0" Grid.Column="2">
@@ -159,21 +159,16 @@
         </StackPanel>
 
         <StackPanel Grid.Row="0" Grid.Column="3">
-            <StackPanel.Resources>
-                <ResourceDictionary>
-                    <ResourceDictionary.MergedDictionaries>
-                        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/FlatButton.xaml" />
-                    </ResourceDictionary.MergedDictionaries>
-                </ResourceDictionary>
-            </StackPanel.Resources>
             <Label Content="Flat button" Style="{DynamicResource DescriptionHeaderStyle}" />
             <Button Width="100"
                     Margin="{StaticResource ControlMargin}"
-                    Content="Enabled" />
+                    Content="Enabled"
+                    Style="{StaticResource MahApps.Styles.Button.Flat}" />
             <Button Width="100"
                     Margin="{StaticResource ControlMargin}"
                     Content="Disabled"
-                    IsEnabled="False" />
+                    IsEnabled="False"
+                    Style="{StaticResource MahApps.Styles.Button.Flat}" />
         </StackPanel>
 
         <StackPanel Grid.Row="0" Grid.Column="4">

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
@@ -174,8 +174,8 @@
                                         ElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid}"
                                         Header="Row Selected" />
                 <DataGridCheckBoxColumn Binding="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                        EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid}"
-                                        ElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid}"
+                                        EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid.Win10}"
+                                        ElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid.Win10}"
                                         Header="Album Selected" />
                 <DataGridTextColumn Binding="{Binding Title}"
                                     EditingElementStyle="{StaticResource MahApps.Styles.TextBox.DataGrid.Editing}"

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DateExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DateExamples.xaml
@@ -88,7 +88,12 @@
                           DisplayDateStart="{x:Static system:DateTime.Now}"
                           IsTodayHighlighted="{Binding ElementName=IsTodayHighlightedCheckBox, Path=IsChecked, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                           SelectionMode="MultipleRange" />
-                <Calendar Margin="{StaticResource ControlMargin}" IsEnabled="False" />
+                <Calendar Margin="{StaticResource ControlMargin}"
+                          IsTodayHighlighted="{Binding ElementName=IsTodayHighlightedCheckBox, Path=IsChecked, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                          SelectionMode="MultipleRange" />
+                <Calendar Margin="{StaticResource ControlMargin}"
+                          IsEnabled="False"
+                          IsTodayHighlighted="{Binding ElementName=IsTodayHighlightedCheckBox, Path=IsChecked, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
             </StackPanel>
 
             <StackPanel Grid.Column="2" Margin="{StaticResource ColumnMargin}">

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuDefault.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuDefault.xaml
@@ -118,7 +118,7 @@
                 <Controls:ToggleSwitch Margin="0 10 0 5"
                                        Header="CanResizeOpenPane:"
                                        IsOn="{Binding ElementName=HamburgerMenuControl, Path=CanResizeOpenPane, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-                
+
                 <Controls:MetroHeader Margin="0 10 0 5" Header="PanePlacement:">
                     <ComboBox MinWidth="150"
                               HorizontalAlignment="Left"

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml
@@ -12,8 +12,6 @@
              mc:Ignorable="d">
 
     <UserControl.Resources>
-        <Style BasedOn="{StaticResource MahApps.Styles.Slider.Win10}" TargetType="{x:Type Slider}" />
-
         <Style BasedOn="{StaticResource {x:Type Controls:MetroHeader}}" TargetType="{x:Type Controls:MetroHeader}">
             <Setter Property="Controls:HeaderedControlHelper.HeaderMargin" Value="0 0 0 5" />
             <Setter Property="FontSize" Value="15" />

diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml
@@ -51,7 +51,6 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Styles.Slider.Win10}"
                             Value="25" />
                     <ProgressBar Width="250"
                                  Margin="4"
@@ -131,7 +130,6 @@
                             Minimum="0"
                             Orientation="Horizontal"
                             SmallChange="1"
-                            Style="{DynamicResource MahApps.Styles.Slider.Win10}"
                             Value="25" />
                     <Controls:MetroProgressBar Width="250"
                                                Margin="4"