Skip to content

Commit 89e682a

Browse files
ButchersBoyButchersBoy
committed
resurrected left drawer animations
1 parent cb5b9c6 commit 89e682a

File tree

2 files changed

+24
-31
lines changed

2 files changed

+24
-31
lines changed

‎MainDemo.Wpf/App.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Application x:Class="MaterialDesignColors.WpfExample.App"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
StartupUri="MainWindow.xaml">
4+
StartupUri="ProvingGround.xaml">
55
<Application.Resources>
66
<ResourceDictionary>
77
<ResourceDictionary.MergedDictionaries>

‎MaterialDesignThemes.Wpf/Themes/Generic.xaml

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
xmlns:local="clr-namespace:MaterialDesignThemes.Wpf"
55
xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
66
xmlns:controlzEx="clr-namespace:ControlzEx"
7-
xmlns:sys="clr-namespace:System;assembly=mscorlib"
8-
xmlns:transitions="clr-namespace:MaterialDesignThemes.Wpf.Transitions">
7+
xmlns:transitions="clr-namespace:MaterialDesignThemes.Wpf.Transitions"
8+
xmlns:system="clr-namespace:System;assembly=mscorlib">
99

1010
<ResourceDictionary.MergedDictionaries>
1111
<!-- we only bring in the dictionaries for controls which were "invented"
@@ -34,7 +34,8 @@
3434

3535
<converters:BrushToRadialGradientBrushConverter x:Key="BrushToRadialGradientBrushConverter" />
3636
<converters:DrawerOffsetConverter x:Key="DrawerOffsetConverter" />
37-
<sys:Boolean x:Key="True">True</sys:Boolean>
37+
38+
<system:Boolean x:Key="True">True</system:Boolean>
3839

3940
<Style TargetType="{x:Type local:Ripple}">
4041
<Setter Property="RecognizesAccessKey" Value="True" />
@@ -657,12 +658,11 @@
657658
<Style TargetType="{x:Type local:DrawerHost}">
658659
<Setter Property="local:ShadowAssist.ShadowDepth" Value="Depth3" />
659660
<Setter Property="LeftDrawerBackground" Value="{DynamicResource MaterialDesignPaper}" />
660-
<Setter Property="RightDrawerBackground" Value="{DynamicResource MaterialDesignPaper}" />
661661
<Setter Property="IsTabStop" Value="False" />
662662
<Setter Property="Template">
663663
<Setter.Value>
664664
<ControlTemplate TargetType="{x:Type local:DrawerHost}">
665-
<Grid>
665+
<Grid x:Name="RootGrid">
666666
<VisualStateManager.VisualStateGroups>
667667
<VisualStateGroup x:Name="AllDrawers">
668668
<VisualStateGroup.Transitions>
@@ -680,7 +680,7 @@
680680
<EasingDoubleKeyFrame.EasingFunction>
681681
<SineEase EasingMode="EaseOut" />
682682
</EasingDoubleKeyFrame.EasingFunction>
683-
</EasingDoubleKeyFrame>
683+
</EasingDoubleKeyFrame>
684684
</DoubleAnimationUsingKeyFrames>
685685
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentCover"
686686
Storyboard.TargetProperty="Background">
@@ -731,7 +731,7 @@
731731
<VisualStateGroup.Transitions>
732732
<VisualTransition From="LeftDrawerClosed" To="LeftDrawerOpen">
733733
<Storyboard>
734-
<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="X" Storyboard.TargetName="LeftDrawerTranslateTransform_">
734+
<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="X" Storyboard.TargetName="LeftDrawerTranslateTransform">
735735
<EasingDoubleKeyFrame Value="0" KeyTime="0:0:0.4">
736736
<EasingDoubleKeyFrame.EasingFunction>
737737
<SineEase EasingMode="EaseOut" />
@@ -759,10 +759,21 @@
759759
</Storyboard>
760760
</VisualTransition>
761761
</VisualStateGroup.Transitions>
762+
<VisualState x:Name="LeftDrawerOpen">
763+
<Storyboard>
764+
<DoubleAnimation Storyboard.TargetName="LeftDrawerShadow" Storyboard.TargetProperty="Opacity" From="0" To="1" Duration="0" />
765+
<DoubleAnimation Storyboard.TargetProperty="X" Storyboard.TargetName="LeftDrawerTranslateTransform" To="0" Duration="0"/>
766+
</Storyboard>
767+
</VisualState>
768+
<VisualState x:Name="LeftDrawerClosed">
769+
<Storyboard>
770+
<DoubleAnimation Storyboard.TargetName="LeftDrawerShadow" Storyboard.TargetProperty="Opacity" From="0" To="0" Duration="0" />
771+
<DoubleAnimation Storyboard.TargetProperty="X" Storyboard.TargetName="LeftDrawerTranslateTransform" Duration="0"/>
772+
</Storyboard>
773+
</VisualState>
762774
</VisualStateGroup>
763775
<VisualStateGroup x:Name="RightDrawer">
764776
<VisualStateGroup.Transitions>
765-
<!--
766777
<VisualTransition From="RightDrawerClosed" To="RightDrawerOpen">
767778
<Storyboard>
768779
<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="X" Storyboard.TargetName="RightDrawerTranslateTransform">
@@ -792,21 +803,7 @@
792803
</DoubleAnimationUsingKeyFrames>
793804
</Storyboard>
794805
</VisualTransition>
795-
-->
796806
</VisualStateGroup.Transitions>
797-
<VisualState x:Name="LeftDrawerOpen">
798-
<Storyboard>
799-
<DoubleAnimation Storyboard.TargetName="LeftDrawerShadow" Storyboard.TargetProperty="Opacity" From="0" To="1" Duration="0" />
800-
<DoubleAnimation Storyboard.TargetProperty="X" Storyboard.TargetName="LeftDrawerTranslateTransform" To="0" Duration="0"/>
801-
</Storyboard>
802-
</VisualState>
803-
<VisualState x:Name="LeftDrawerClosed">
804-
<Storyboard>
805-
<DoubleAnimation Storyboard.TargetName="LeftDrawerShadow" Storyboard.TargetProperty="Opacity" From="0" To="0" Duration="0" />
806-
<DoubleAnimation Storyboard.TargetProperty="X" Storyboard.TargetName="LeftDrawerTranslateTransform" Duration="0"/>
807-
</Storyboard>
808-
</VisualState>
809-
<!--
810807
<VisualState x:Name="RightDrawerOpen">
811808
<Storyboard>
812809
<DoubleAnimation Storyboard.TargetName="RightDrawerShadow" Storyboard.TargetProperty="Opacity" From="0" To="1" Duration="0" />
@@ -819,14 +816,12 @@
819816
<DoubleAnimation Storyboard.TargetProperty="X" Storyboard.TargetName="RightDrawerTranslateTransform" Duration="0"/>
820817
</Storyboard>
821818
</VisualState>
822-
-->
823819
</VisualStateGroup>
824820
</VisualStateManager.VisualStateGroups>
825821
<AdornerDecorator>
826822
<ContentPresenter
827-
x:Name="ContentPresenter"
828-
Opacity="1"
829-
Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentStringFormat="{TemplateBinding ContentStringFormat}" />
823+
x:Name="ContentPresenter" Opacity="1"
824+
Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentStringFormat="{TemplateBinding ContentStringFormat}" />
830825
</AdornerDecorator>
831826
<Grid x:Name="PART_ContentCover" Background="{x:Null}" Opacity="0" IsHitTestVisible="False" Focusable="False" />
832827
<Grid HorizontalAlignment="Left" VerticalAlignment="Stretch">
@@ -846,7 +841,6 @@
846841
</AdornerDecorator>
847842
<ContentPresenter Content="{TemplateBinding LeftDrawerContent}" ContentTemplate="{TemplateBinding LeftDrawerContentTemplate}" ContentStringFormat="{TemplateBinding LeftDrawerContentStringFormat}" />
848843
</Grid>
849-
<!--
850844
<Grid VerticalAlignment="Stretch" HorizontalAlignment="Right">
851845
<Grid.RenderTransform>
852846
<TranslateTransform x:Name="RightDrawerTranslateTransform"
@@ -863,13 +857,12 @@
863857
</Border>
864858
</AdornerDecorator>
865859
<ContentPresenter Content="{TemplateBinding RightDrawerContent}" ContentTemplate="{TemplateBinding RightDrawerContentTemplate}" ContentStringFormat="{TemplateBinding RightDrawerContentStringFormat}" />
866-
</Grid>
867-
-->
860+
</Grid>
868861
</Grid>
869862
</ControlTemplate>
870863
</Setter.Value>
871864
</Setter>
872-
</Style>
865+
</Style>
873866

874867
<Style TargetType="{x:Type local:PackIcon}">
875868
<Setter Property="Height" Value="16" />

0 commit comments

Comments
 (0)