Merge branch 'master' of https://github.com/ButchersBoy/MaterialDesignInXamlToolkit

Author: ButchersBoy

MainDemo.Wpf/ColorZones.xaml

@@ -42,7 +42,7 @@
                     <ToggleButton Style="{DynamicResource MaterialDesignHamburgerToggleButton}" />
                     <wpf:ColorZone Mode="Standard" Padding="8 4 8 4" CornerRadius="2" Panel.ZIndex="1"
                                    Margin="16 0 0 0"
-                                   Effect="{DynamicResource MaterialDesignShadowDepth1}">
+                                   wpf:ShadowAssist.ShadowDepth="Depth1">
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" />

MainDemo.Wpf/MainWindow.xaml

@@ -35,7 +35,7 @@
 
     <wpf:DialogHost Identifier="RootDialog">
         <DockPanel>
-            <wpf:ColorZone Padding="16" Effect="{StaticResource MaterialDesignShadowDepth2}"
+            <wpf:ColorZone Padding="16" wpf:ShadowAssist.ShadowDepth="Depth2"
                            Mode="PrimaryMid" DockPanel.Dock="Top">
                 <DockPanel>
                     <ToggleButton Style="{StaticResource MaterialDesignHamburgerToggleButton}" IsChecked="True"

MaterialDesignThemes.Wpf/Themes/Generic.xaml

@@ -354,25 +354,28 @@
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="Effect" Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:ShadowAssist.ShadowDepth), Converter={x:Static converters:ShadowConverter.Instance}}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:ColorZone}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{TemplateBinding CornerRadius}"
-                            ClipToBounds="True"                            
-                            >
-                        <ContentPresenter Content="{TemplateBinding Content}"
-                                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                                          TextElement.Foreground="{TemplateBinding Foreground}"
-                                          RecognizesAccessKey="True"
-                                          Cursor="{TemplateBinding Cursor}"
-                                          Margin="{TemplateBinding Padding}"
-                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                    </Border>
+                    <Grid Background="Transparent">
+                        <Border Background="{TemplateBinding Background}"
+                                CornerRadius="{TemplateBinding CornerRadius}"
+                                Effect="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:ShadowAssist.ShadowDepth), Converter={x:Static converters:ShadowConverter.Instance}}" />
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="{TemplateBinding CornerRadius}"
+                                ClipToBounds="True" >
+                            <ContentPresenter Content="{TemplateBinding Content}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              TextElement.Foreground="{TemplateBinding Foreground}"
+                                              RecognizesAccessKey="True"
+                                              Cursor="{TemplateBinding Cursor}"
+                                              Margin="{TemplateBinding Padding}"
+                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        </Border>
+                    </Grid>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -532,7 +535,7 @@
                                 </ResourceDictionary>
                             </Popup.Resources>
                             <local:Card Margin="22"                                                                                 
-                                        Effect="{DynamicResource MaterialDesignShadowDepth5}"
+                                        local:ShadowAssist.ShadowDepth="Depth5"
                                         UniformCornerRadius="4"
                                         TextElement.Foreground="{DynamicResource MaterialDesignBody}"
                                         TextElement.FontWeight="Medium"

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Card.xaml

@@ -10,18 +10,20 @@
     <converters:CardClipConverter x:Key="CardClipConverter" />
 
     <ControlTemplate TargetType="{x:Type wpf:Card}" x:Key="CardTemplate">
-        <Border Margin="{TemplateBinding Margin}"
-                Effect="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ShadowAssist.ShadowDepth), Converter={x:Static converters:ShadowConverter.Instance}}"
-                CornerRadius="{TemplateBinding UniformCornerRadius}" Background="Transparent">
-            <Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" 
-                    x:Name="PART_ClipBorder"
-                    Clip="{TemplateBinding ContentClip}">                
-                <ContentPresenter 
-                    x:Name="ContentPresenter"                    
-                    Content="{TemplateBinding ContentControl.Content}" ContentTemplate="{TemplateBinding ContentControl.ContentTemplate}" ContentStringFormat="{TemplateBinding ContentControl.ContentStringFormat}">                    
-                </ContentPresenter>
-            </Border>                        
-        </Border>
+        <Grid Margin="{TemplateBinding Margin}" Background="Transparent">
+            <Border Effect="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ShadowAssist.ShadowDepth), Converter={x:Static converters:ShadowConverter.Instance}}"
+                    CornerRadius="{TemplateBinding UniformCornerRadius}">
+                <Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" 
+                        x:Name="PART_ClipBorder"
+                        Clip="{TemplateBinding ContentClip}" />                        
+            </Border>
+            <ContentPresenter 
+                x:Name="ContentPresenter"                    
+                Margin="{TemplateBinding Padding}"
+                Clip="{TemplateBinding ContentClip}"
+                Content="{TemplateBinding ContentControl.Content}" ContentTemplate="{TemplateBinding ContentControl.ContentTemplate}" ContentStringFormat="{TemplateBinding ContentControl.ContentStringFormat}">                    
+            </ContentPresenter>
+        </Grid>
     </ControlTemplate>
     <Style TargetType="{x:Type wpf:Card}">
         <Setter Property="TextOptions.TextFormattingMode" Value="Display" />