move left drawer over to new margin animation

Author: ButchersBoy

MaterialDesignThemes.Wpf/Converters/DrawerOffsetConverter.cs

@@ -5,6 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Data;
 
 namespace MaterialDesignThemes.Wpf.Converters
@@ -16,12 +17,19 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             var d = value as double? ?? 0;
             if (double.IsInfinity(d) || double.IsNaN(d)) d = 0;
 
-            if (parameter is bool && (bool)parameter)
+            var dock = (parameter is Dock) ? (Dock)parameter : Dock.Left;
+            switch (dock)
             {
-                return new Thickness(0, 0, 0 - d, 0);
+                case Dock.Top:
+                    return new Thickness(0, 0 - d, 0, 0);
+                case Dock.Bottom:
+                    return new Thickness(0, 0, 0, 0 - d);
+                case Dock.Right:
+                    return new Thickness(0, 0, 0 - d, 0);
+                case Dock.Left:
+                default:
+                    return new Thickness(0 - d, 0, 0, 0);
             }
-                        
-            return 0 - d;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

MaterialDesignThemes.Wpf/DrawerHost.cs

@@ -169,6 +169,7 @@ public override void OnApplyTemplate()
         private void TemplateContentCoverElementOnPreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs mouseButtonEventArgs)
         {
             SetCurrentValue(IsLeftDrawerOpenProperty, false);
+            SetCurrentValue(IsRightDrawerOpenProperty, false);
         }
 
         private void UpdateVisualStates(bool? useTransitions = null)

MaterialDesignThemes.Wpf/Themes/Generic.xaml

@@ -732,23 +732,23 @@
                                 <VisualStateGroup.Transitions>
                                     <VisualTransition From="LeftDrawerClosed" To="LeftDrawerOpen">
                                         <Storyboard>
-                                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="X" Storyboard.TargetName="LeftDrawerTranslateTransform">
-                                                <EasingDoubleKeyFrame Value="0" KeyTime="0:0:0.4">
-                                                    <EasingDoubleKeyFrame.EasingFunction>
+                                            <ThicknessAnimationUsingKeyFrames Storyboard.TargetProperty="Margin" Storyboard.TargetName="LeftDrawerGrid">
+                                                <EasingThicknessKeyFrame Value="0" KeyTime="0:0:0.4">
+                                                    <EasingThicknessKeyFrame.EasingFunction>
                                                         <SineEase EasingMode="EaseOut" />
-                                                    </EasingDoubleKeyFrame.EasingFunction>
-                                                </EasingDoubleKeyFrame>
-                                            </DoubleAnimationUsingKeyFrames>
+                                                    </EasingThicknessKeyFrame.EasingFunction>
+                                                </EasingThicknessKeyFrame>
+                                            </ThicknessAnimationUsingKeyFrames>
                                             <DoubleAnimation Storyboard.TargetName="LeftDrawerShadow" Storyboard.TargetProperty="Opacity" From="0" To="1" Duration="0:0:0.04" />
                                         </Storyboard>
                                     </VisualTransition>
                                     <VisualTransition From="LeftDrawerOpen" To="LeftDrawerClosed">
                                         <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetProperty="X" Storyboard.TargetName="LeftDrawerTranslateTransform" Duration="0:0:0.4">
-                                                <DoubleAnimation.EasingFunction>
+                                            <ThicknessAnimation Storyboard.TargetProperty="Margin" Storyboard.TargetName="LeftDrawerGrid" Duration="0:0:0.4">
+                                                <ThicknessAnimation.EasingFunction>
                                                     <SineEase EasingMode="EaseOut" />
-                                                </DoubleAnimation.EasingFunction>
-                                            </DoubleAnimation>
+                                                </ThicknessAnimation.EasingFunction>
+                                            </ThicknessAnimation>
                                             <DoubleAnimationUsingKeyFrames Storyboard.TargetName="LeftDrawerShadow" Storyboard.TargetProperty="Opacity">
                                                 <EasingDoubleKeyFrame Value="1" KeyTime="0:0:0.36" />
                                                 <EasingDoubleKeyFrame Value="0" KeyTime="0:0:0.4">
@@ -763,13 +763,13 @@
                                 <VisualState x:Name="LeftDrawerOpen">
                                     <Storyboard>
                                         <DoubleAnimation Storyboard.TargetName="LeftDrawerShadow" Storyboard.TargetProperty="Opacity" From="0" To="1" Duration="0" />
-                                        <DoubleAnimation Storyboard.TargetProperty="X" Storyboard.TargetName="LeftDrawerTranslateTransform" To="0" Duration="0"/>
+                                        <ThicknessAnimation Storyboard.TargetProperty="Margin" Storyboard.TargetName="LeftDrawerGrid" To="0" Duration="0"/>
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="LeftDrawerClosed">
                                     <Storyboard>
                                         <DoubleAnimation Storyboard.TargetName="LeftDrawerShadow" Storyboard.TargetProperty="Opacity" From="0" To="0" Duration="0" />
-                                        <DoubleAnimation Storyboard.TargetProperty="X" Storyboard.TargetName="LeftDrawerTranslateTransform" Duration="0"/>
+                                        <ThicknessAnimation Storyboard.TargetProperty="Margin" Storyboard.TargetName="LeftDrawerGrid" Duration="0"/>
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
@@ -825,11 +825,9 @@
                                     Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentStringFormat="{TemplateBinding ContentStringFormat}" />
                         </AdornerDecorator>
                         <Grid x:Name="PART_ContentCover" Background="{x:Null}" Opacity="0" IsHitTestVisible="False" Focusable="False" />
-                        <Grid HorizontalAlignment="Left" VerticalAlignment="Stretch">
-                            <Grid.RenderTransform>
-                                <TranslateTransform x:Name="LeftDrawerTranslateTransform"
-                                                    X="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=Grid}, Path=ActualWidth, Converter={StaticResource DrawerOffsetConverter}}" />
-                            </Grid.RenderTransform>
+                        <Grid HorizontalAlignment="Left" VerticalAlignment="Stretch"
+                              x:Name="LeftDrawerGrid"
+                              Margin="{Binding RelativeSource={RelativeSource Self}, Path=ActualWidth, Converter={StaticResource DrawerOffsetConverter}, ConverterParameter={x:Static Dock.Left}}">
                             <AdornerDecorator>
                                 <AdornerDecorator.CacheMode>
                                     <BitmapCache EnableClearType="True" SnapsToDevicePixels="True"/>
@@ -844,7 +842,7 @@
                         </Grid>
                         <Grid VerticalAlignment="Stretch" HorizontalAlignment="Right"
                               x:Name="RightDrawerGrid"
-                              Margin="{Binding RelativeSource={RelativeSource Self}, Path=ActualWidth, Converter={StaticResource DrawerOffsetConverter}, ConverterParameter={StaticResource True}}">
+                              Margin="{Binding RelativeSource={RelativeSource Self}, Path=ActualWidth, Converter={StaticResource DrawerOffsetConverter}, ConverterParameter={x:Static Dock.Right}}">
                             <AdornerDecorator>
                                 <AdornerDecorator.CacheMode>
                                     <BitmapCache EnableClearType="True" SnapsToDevicePixels="True"/>