Skip to content

Commit 0bf3be4

Browse files
committed
Update parent nodes in treeview i
1 parent 747c9b2 commit 0bf3be4

File tree

1 file changed

+17
-28
lines changed

1 file changed

+17
-28
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeView.xaml

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -214,53 +214,41 @@
214214
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="Visibility">
215215
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
216216
</ObjectAnimationUsingKeyFrames>
217-
<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost">
218-
<EasingDoubleKeyFrame KeyTime="0" Value="0"/>
219-
<EasingDoubleKeyFrame KeyTime="0:0:0.3" Value="1"/>
220-
</DoubleAnimationUsingKeyFrames>
221-
<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Tag" Storyboard.TargetName="ItemsScrollViewer">
222-
<EasingDoubleKeyFrame KeyTime="0" Value="0"/>
223-
<EasingDoubleKeyFrame KeyTime="0:0:0.3" Value="1"/>
224-
</DoubleAnimationUsingKeyFrames>
217+
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost"
218+
To="1" Duration="0:0:0.3"/>
219+
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ItemsScrollViewer"
220+
To="1" Duration="0:0:0.3"/>
225221
</Storyboard>
226222
</VisualTransition>
227223
<VisualTransition GeneratedDuration="0" To="Collapsed">
228224
<Storyboard>
229225
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="Visibility">
230226
<DiscreteObjectKeyFrame KeyTime="0:0:0.5" Value="{x:Static Visibility.Collapsed}" />
231227
</ObjectAnimationUsingKeyFrames>
232-
<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost">
233-
<EasingDoubleKeyFrame KeyTime="0" Value="1"/>
234-
<EasingDoubleKeyFrame KeyTime="0:0:0.3" Value="0"/>
235-
</DoubleAnimationUsingKeyFrames>
236-
<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Tag" Storyboard.TargetName="ItemsScrollViewer">
237-
<EasingDoubleKeyFrame KeyTime="0" Value="1"/>
238-
<EasingDoubleKeyFrame KeyTime="0:0:0.5" Value="0"/>
239-
</DoubleAnimationUsingKeyFrames>
228+
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost"
229+
To="0" Duration="0:0:0.3"/>
230+
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ItemsScrollViewer"
231+
To="0" Duration="0:0:0.5"/>
240232
</Storyboard>
241233
</VisualTransition>
242234
</VisualStateGroup.Transitions>
243235
<VisualState x:Name="Expanded">
244236
<Storyboard>
245-
<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost">
246-
<EasingDoubleKeyFrame KeyTime="0" Value="1"/>
247-
</DoubleAnimationUsingKeyFrames>
248-
<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Tag" Storyboard.TargetName="ItemsScrollViewer">
249-
<EasingDoubleKeyFrame KeyTime="0:0:0" Value="1"/>
250-
</DoubleAnimationUsingKeyFrames>
237+
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost"
238+
To="1" Duration="0"/>
239+
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ItemsScrollViewer"
240+
To="1" Duration="0"/>
251241
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="Visibility">
252242
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
253243
</ObjectAnimationUsingKeyFrames>
254244
</Storyboard>
255245
</VisualState>
256246
<VisualState x:Name="Collapsed">
257247
<Storyboard>
258-
<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost">
259-
<EasingDoubleKeyFrame KeyTime="0" Value="0"/>
260-
</DoubleAnimationUsingKeyFrames>
261-
<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Tag" Storyboard.TargetName="ItemsScrollViewer">
262-
<EasingDoubleKeyFrame KeyTime="0:0:0" Value="0"/>
263-
</DoubleAnimationUsingKeyFrames>
248+
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost"
249+
To="0" Duration="0"/>
250+
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ItemsScrollViewer"
251+
To="0" Duration="0"/>
264252
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="Visibility">
265253
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
266254
</ObjectAnimationUsingKeyFrames>
@@ -314,6 +302,7 @@
314302
</MultiBinding>
315303
</ScrollViewer.Height>
316304
<ItemsPresenter x:Name="ItemsHost"
305+
VerticalAlignment="Top"
317306
Opacity="0"
318307
Visibility="Collapsed"/>
319308
</ScrollViewer>

0 commit comments

Comments
 (0)