Skip to content

Commit 8567c14

Browse files
committed
When DialogHost is created programatically and manually added to the visual tree, ensure the states are applied immediately.
1 parent 495d8f6 commit 8567c14

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DialogHost.xaml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,12 @@
119119
</VisualStateGroup.Transitions>
120120
<VisualState x:Name="Open">
121121
<Storyboard>
122-
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="PART_Popup" Storyboard.TargetProperty="IsOpen">
122+
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="PART_Popup" Storyboard.TargetProperty="IsOpen"
123+
Duration="0">
123124
<DiscreteBooleanKeyFrame Value="True" KeyTime="0" />
124125
</BooleanAnimationUsingKeyFrames>
125126
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentCoverGrid"
126-
Storyboard.TargetProperty="Background">
127+
Storyboard.TargetProperty="Background" Duration="0">
127128
<DiscreteObjectKeyFrame Value="{StaticResource BlackBackground}" />
128129
</ObjectAnimationUsingKeyFrames>
129130
<DoubleAnimation Storyboard.TargetName="PART_ContentCoverGrid" Storyboard.TargetProperty="Opacity"
@@ -143,14 +144,14 @@
143144
<VisualState x:Name="Closed">
144145
<Storyboard>
145146
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="PART_Popup" Storyboard.TargetProperty="IsOpen">
146-
<DiscreteBooleanKeyFrame Value="False" KeyTime="0:0:0.3" />
147+
<DiscreteBooleanKeyFrame Value="False" KeyTime="0" />
147148
</BooleanAnimationUsingKeyFrames>
148149
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentCoverGrid"
149-
Storyboard.TargetProperty="Background">
150+
Storyboard.TargetProperty="Background" Duration="0">
150151
<DiscreteObjectKeyFrame Value="{x:Null}" />
151152
</ObjectAnimationUsingKeyFrames>
152153
<DoubleAnimation Storyboard.TargetName="PART_ContentCoverGrid" Storyboard.TargetProperty="Opacity"
153-
To="0" />
154+
To="0" Duration="0"/>
154155
</Storyboard>
155156
</VisualState>
156157
</VisualStateGroup>
@@ -309,11 +310,13 @@
309310
</VisualStateGroup.Transitions>
310311
<VisualState x:Name="Open">
311312
<Storyboard>
312-
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Popup" Storyboard.TargetProperty="Visibility">
313+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Popup" Storyboard.TargetProperty="Visibility"
314+
Duration="0">
313315
<DiscreteObjectKeyFrame Value="{x:Static Visibility.Visible}" KeyTime="0" />
314316
</ObjectAnimationUsingKeyFrames>
315317
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentCoverGrid"
316-
Storyboard.TargetProperty="Background">
318+
Storyboard.TargetProperty="Background"
319+
Duration="0">
317320
<DiscreteObjectKeyFrame Value="{StaticResource BlackBackground}" KeyTime="0" />
318321
</ObjectAnimationUsingKeyFrames>
319322
<DoubleAnimation Storyboard.TargetName="PART_ContentCoverGrid" Storyboard.TargetProperty="Opacity"
@@ -332,11 +335,13 @@
332335
</VisualState>
333336
<VisualState x:Name="Closed">
334337
<Storyboard>
335-
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Popup" Storyboard.TargetProperty="Visibility">
338+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Popup" Storyboard.TargetProperty="Visibility"
339+
Duration="0">
336340
<DiscreteObjectKeyFrame Value="{x:Static Visibility.Collapsed}" KeyTime="0" />
337341
</ObjectAnimationUsingKeyFrames>
338342
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentCoverGrid"
339-
Storyboard.TargetProperty="Background">
343+
Storyboard.TargetProperty="Background"
344+
Duration="0">
340345
<DiscreteObjectKeyFrame Value="{x:Null}" />
341346
</ObjectAnimationUsingKeyFrames>
342347
<DoubleAnimation Storyboard.TargetName="PART_ContentCoverGrid" Storyboard.TargetProperty="Opacity"

0 commit comments

Comments
 (0)