Skip to content

Commit 66abe4e

Browse files
punker76punker76
committed
Fix DoubleAnimation designer exception
 Use Opacity property here too, cause it animates the same double value as for the Tag property
1 parent eda71e1 commit 66abe4e

File tree

2 files changed

+9
-35
lines changed

2 files changed

+9
-35
lines changed

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Expander.xaml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,7 @@
233233
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="Visibility">
234234
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
235235
</ObjectAnimationUsingKeyFrames>
236-
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Content"
237-
To="1" Duration="0:0:0.3"/>
238-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ContentPanel"
239-
To="1" Duration="0:0:0.3"/>
236+
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Content" To="1" Duration="0:0:0.3"/>
240237
</Storyboard>
241238
</VisualTransition>
242239
<VisualTransition GeneratedDuration="0" To="Collapsed">
@@ -247,17 +244,13 @@
247244
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="Visibility">
248245
<DiscreteObjectKeyFrame KeyTime="0:0:0.3" Value="{x:Static Visibility.Collapsed}" />
249246
</ObjectAnimationUsingKeyFrames>
250-
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Content"
251-
To="0" Duration="0:0:0.3"/>
252-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ContentPanel"
253-
To="0" Duration="0:0:0.3"/>
247+
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Content" To="0" Duration="0:0:0.3"/>
254248
</Storyboard>
255249
</VisualTransition>
256250
</VisualStateGroup.Transitions>
257251
<VisualState x:Name="Expanded">
258252
<Storyboard>
259253
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Content" To="1" Duration="0"/>
260-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ContentPanel" To="1" Duration="0"/>
261254
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="Visibility">
262255
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
263256
</ObjectAnimationUsingKeyFrames>
@@ -266,7 +259,6 @@
266259
<VisualState x:Name="Collapsed">
267260
<Storyboard>
268261
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Content" To="0" Duration="0"/>
269-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ContentPanel" To="0" Duration="0"/>
270262
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="Visibility">
271263
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Hidden}" />
272264
</ObjectAnimationUsingKeyFrames>
@@ -291,19 +283,16 @@
291283
DockPanel.Dock="Bottom">
292284
<StackPanel Name="ContentPanel"
293285
HorizontalAlignment="Left">
294-
<StackPanel.Tag>
295-
<system:Double>0.0</system:Double>
296-
</StackPanel.Tag>
297286
<StackPanel.Height>
298287
<MultiBinding Converter="{StaticResource MathMlpMultipleConverter}">
299288
<Binding ElementName="PART_Content" Path="ActualHeight"/>
300-
<Binding RelativeSource="{RelativeSource Self}" Path="Tag"/>
289+
<Binding ElementName="PART_Content" Path="Opacity"/>
301290
</MultiBinding>
302291
</StackPanel.Height>
303292
<StackPanel.Width>
304293
<MultiBinding Converter="{StaticResource MathMlpMultipleConverter}">
305294
<Binding ElementName="PART_Content" Path="ActualWidth"/>
306-
<Binding RelativeSource="{RelativeSource Self}" Path="Tag"/>
295+
<Binding ElementName="PART_Content" Path="Opacity"/>
307296
</MultiBinding>
308297
</StackPanel.Width>
309298
<ContentPresenter Name="PART_Content" Focusable="False"

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TreeView.xaml

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,7 @@
214214
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="Visibility">
215215
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
216216
</ObjectAnimationUsingKeyFrames>
217-
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost"
218-
To="1" Duration="0:0:0.3"/>
219-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ItemsPanel"
220-
To="1" Duration="0:0:0.3"/>
217+
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost" To="1" Duration="0:0:0.3"/>
221218
</Storyboard>
222219
</VisualTransition>
223220
<VisualTransition GeneratedDuration="0" To="Collapsed">
@@ -228,30 +225,21 @@
228225
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="Visibility">
229226
<DiscreteObjectKeyFrame KeyTime="0:0:0.3" Value="{x:Static Visibility.Collapsed}" />
230227
</ObjectAnimationUsingKeyFrames>
231-
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost"
232-
To="0" Duration="0:0:0.3"/>
233-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ItemsPanel"
234-
To="0" Duration="0:0:0.3"/>
228+
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost" To="0" Duration="0:0:0.3"/>
235229
</Storyboard>
236230
</VisualTransition>
237231
</VisualStateGroup.Transitions>
238232
<VisualState x:Name="Expanded">
239233
<Storyboard>
240-
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost"
241-
To="1" Duration="0"/>
242-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ItemsPanel"
243-
To="1" Duration="0"/>
234+
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost" To="1" Duration="0"/>
244235
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="Visibility">
245236
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
246237
</ObjectAnimationUsingKeyFrames>
247238
</Storyboard>
248239
</VisualState>
249240
<VisualState x:Name="Collapsed">
250241
<Storyboard>
251-
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost"
252-
To="0" Duration="0"/>
253-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ItemsPanel"
254-
To="0" Duration="0"/>
242+
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ItemsHost" To="0" Duration="0"/>
255243
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="Visibility">
256244
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
257245
</ObjectAnimationUsingKeyFrames>
@@ -294,13 +282,10 @@
294282
x:Name="ItemsPanel"
295283
Margin="-16 0 0 0"
296284
Grid.ColumnSpan="2">
297-
<StackPanel.Tag>
298-
<system:Double>0.0</system:Double>
299-
</StackPanel.Tag>
300285
<StackPanel.Height>
301286
<MultiBinding Converter="{StaticResource MathMlpMultipleConverter}">
302287
<Binding ElementName="ItemsHost" Path="ActualHeight"/>
303-
<Binding RelativeSource="{RelativeSource Self}" Path="Tag"/>
288+
<Binding ElementName="ItemsHost" Path="Opacity"/>
304289
</MultiBinding>
305290
</StackPanel.Height>
306291
<ItemsPresenter x:Name="ItemsHost"

0 commit comments

Comments
 (0)