Skip to content

Commit 51c3840

Browse files
committed
Use dedicated ScaleHost. Fixes #561
1 parent 7a7b828 commit 51c3840

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeView.xaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@
187187
<Storyboard>
188188
<DoubleAnimation Storyboard.TargetName="MouseOverBorder" Storyboard.TargetProperty="Opacity"
189189
To="0.1" Duration="0"/>
190+
<DoubleAnimation Storyboard.TargetName="MouseOverBorder" Storyboard.TargetProperty="Opacity"
191+
To="0.1" Duration="0"/>
190192
</Storyboard>
191193
</VisualState>
192194
<VisualState Name="Disabled"/>
@@ -215,6 +217,7 @@
215217
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
216218
</ObjectAnimationUsingKeyFrames>
217219
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost" To="1" Duration="0:0:0.3"/>
220+
<DoubleAnimation Storyboard.TargetProperty="Scale" Storyboard.TargetName="ScaleHost" To="1" Duration="0:0:0.3"/>
218221
</Storyboard>
219222
</VisualTransition>
220223
<VisualTransition GeneratedDuration="0" To="Collapsed">
@@ -226,12 +229,14 @@
226229
<DiscreteObjectKeyFrame KeyTime="0:0:0.3" Value="{x:Static Visibility.Collapsed}" />
227230
</ObjectAnimationUsingKeyFrames>
228231
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost" To="0" Duration="0:0:0.3"/>
232+
<DoubleAnimation Storyboard.TargetProperty="Scale" Storyboard.TargetName="ScaleHost" To="0" Duration="0:0:0.3"/>
229233
</Storyboard>
230234
</VisualTransition>
231235
</VisualStateGroup.Transitions>
232236
<VisualState x:Name="Expanded">
233237
<Storyboard>
234238
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost" To="1" Duration="0"/>
239+
<DoubleAnimation Storyboard.TargetProperty="Scale" Storyboard.TargetName="ScaleHost" To="1" Duration="0:0:0.3"/>
235240
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="Visibility">
236241
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
237242
</ObjectAnimationUsingKeyFrames>
@@ -240,14 +245,15 @@
240245
<VisualState x:Name="Collapsed">
241246
<Storyboard>
242247
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost" To="0" Duration="0"/>
248+
<DoubleAnimation Storyboard.TargetProperty="Scale" Storyboard.TargetName="ScaleHost" To="0" Duration="0:0:0.3"/>
243249
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="Visibility">
244250
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
245251
</ObjectAnimationUsingKeyFrames>
246252
</Storyboard>
247253
</VisualState>
248254
</VisualStateGroup>
249255
</VisualStateManager.VisualStateGroups>
250-
256+
<wpf:ScaleHost x:Name="ScaleHost" />
251257
<ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
252258
Style="{StaticResource MaterialDesignExpandCollapseToggleStyle}"
253259
Foreground="{TemplateBinding Foreground}"
@@ -285,7 +291,7 @@
285291
<StackPanel.Height>
286292
<MultiBinding Converter="{StaticResource MathMlpMultipleConverter}">
287293
<Binding ElementName="ItemsHost" Path="ActualHeight"/>
288-
<Binding ElementName="ItemsHost" Path="Opacity"/>
294+
<Binding ElementName="ScaleHost" Path="Scale"/>
289295
</MultiBinding>
290296
</StackPanel.Height>
291297
<ItemsPresenter x:Name="ItemsHost"

0 commit comments

Comments
 (0)