Skip to content

Commit cced4c8

Browse files
ButchersBoyButchersBoy
authored
Merge pull request #487 from punker76/485-DoubleAnimation-Designer-Fix
Fix DoubleAnimation designer exception
2 parents acd5005 + 66abe4e commit cced4c8

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
@@ -236,10 +236,7 @@
236236
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="Visibility">
237237
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
238238
</ObjectAnimationUsingKeyFrames>
239-
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Content"
240-
To="1" Duration="0:0:0.3"/>
241-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ContentPanel"
242-
To="1" Duration="0:0:0.3"/>
239+
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Content" To="1" Duration="0:0:0.3"/>
243240
</Storyboard>
244241
</VisualTransition>
245242
<VisualTransition GeneratedDuration="0" To="Collapsed">
@@ -250,17 +247,13 @@
250247
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="Visibility">
251248
<DiscreteObjectKeyFrame KeyTime="0:0:0.3" Value="{x:Static Visibility.Collapsed}" />
252249
</ObjectAnimationUsingKeyFrames>
253-
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Content"
254-
To="0" Duration="0:0:0.3"/>
255-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ContentPanel"
256-
To="0" Duration="0:0:0.3"/>
250+
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Content" To="0" Duration="0:0:0.3"/>
257251
</Storyboard>
258252
</VisualTransition>
259253
</VisualStateGroup.Transitions>
260254
<VisualState x:Name="Expanded">
261255
<Storyboard>
262256
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Content" To="1" Duration="0"/>
263-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ContentPanel" To="1" Duration="0"/>
264257
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="Visibility">
265258
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
266259
</ObjectAnimationUsingKeyFrames>
@@ -269,7 +262,6 @@
269262
<VisualState x:Name="Collapsed">
270263
<Storyboard>
271264
<DoubleAnimation Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_Content" To="0" Duration="0"/>
272-
<DoubleAnimation Storyboard.TargetProperty="Tag" Storyboard.TargetName="ContentPanel" To="0" Duration="0"/>
273265
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="Visibility">
274266
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Hidden}" />
275267
</ObjectAnimationUsingKeyFrames>
@@ -294,19 +286,16 @@
294286
DockPanel.Dock="Bottom">
295287
<StackPanel Name="ContentPanel"
296288
HorizontalAlignment="Left">
297-
<StackPanel.Tag>
298-
<system:Double>0.0</system:Double>
299-
</StackPanel.Tag>
300289
<StackPanel.Height>
301290
<MultiBinding Converter="{StaticResource MathMlpMultipleConverter}">
302291
<Binding ElementName="PART_Content" Path="ActualHeight"/>
303-
<Binding RelativeSource="{RelativeSource Self}" Path="Tag"/>
292+
<Binding ElementName="PART_Content" Path="Opacity"/>
304293
</MultiBinding>
305294
</StackPanel.Height>
306295
<StackPanel.Width>
307296
<MultiBinding Converter="{StaticResource MathMlpMultipleConverter}">
308297
<Binding ElementName="PART_Content" Path="ActualWidth"/>
309-
<Binding RelativeSource="{RelativeSource Self}" Path="Tag"/>
298+
<Binding ElementName="PART_Content" Path="Opacity"/>
310299
</MultiBinding>
311300
</StackPanel.Width>
312301
<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)