Skip to content

Commit f9b330e

Browse files
committed
add ability to disable progress fade-in. although only works on second fade in. good enough for now I think. #161
1 parent 8ff2c08 commit f9b330e

File tree

2 files changed

+27
-5
lines changed

2 files changed

+27
-5
lines changed

MainDemo.Wpf/Progress.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<ProgressBar Orientation="Vertical" IsIndeterminate="True" Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" Margin="24" />
3232
<StackPanel Grid.Row="0" Grid.Column="2" HorizontalAlignment="Stretch">
3333
<ProgressBar Value="25" Margin="24" />
34-
<ProgressBar Value="50" Margin="24" />
34+
<ProgressBar Value="50" Margin="24" materialDesign:TransitionAssist.DisableTransitions="True" /> <!-- should disable on 2nd transition... -->
3535
<ProgressBar Value="75" Margin="24" />
3636
<ProgressBar IsIndeterminate="True" Margin="24" />
3737
</StackPanel>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ProgressBar.xaml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:circularProgressBar="clr-namespace:MaterialDesignThemes.Wpf.Converters.CircularProgressBar">
3+
xmlns:circularProgressBar="clr-namespace:MaterialDesignThemes.Wpf.Converters.CircularProgressBar"
4+
xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
5+
46
<Style x:Key="MaterialDesignLinearProgressBar" TargetType="{x:Type ProgressBar}">
57
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkBrush}"/>
68
<Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}"/>
@@ -24,11 +26,16 @@
2426
<EasingDoubleKeyFrame KeyTime="0:0:1" Value="1"/>
2527
</DoubleAnimationUsingKeyFrames>
2628
</Storyboard>
29+
<Storyboard x:Key="OnLoadedNoAnimation">
30+
<DoubleAnimation Storyboard.TargetProperty="(UIElement.Opacity)" Storyboard.TargetName="TemplateRoot" To="1" />
31+
<DoubleAnimation Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="TemplateRoot" To="1" />
32+
<DoubleAnimation Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="TemplateRoot" To="1" />
33+
</Storyboard>
2734
</ControlTemplate.Resources>
2835
<Grid x:Name="TemplateRoot" RenderTransformOrigin="0,0.5" Opacity="0" Height="4">
2936
<Grid.RenderTransform>
3037
<TransformGroup>
31-
<ScaleTransform ScaleX="0" ScaleY="0"/>
38+
<ScaleTransform ScaleX="0" ScaleY="0" />
3239
<SkewTransform/>
3340
<RotateTransform/>
3441
<TranslateTransform/>
@@ -70,11 +77,26 @@
7077
</Grid>
7178
</Grid>
7279
<ControlTemplate.Triggers>
73-
<Trigger Property="IsVisible" Value="True">
80+
<Trigger Property="wpf:TransitionAssist.DisableTransitions" Value="True">
7481
<Trigger.EnterActions>
75-
<BeginStoryboard Storyboard="{StaticResource OnLoaded}"/>
82+
<BeginStoryboard Storyboard="{StaticResource OnLoadedNoAnimation}" Name="BeginStoryboardOnLoadedNoAnimation" />
7683
</Trigger.EnterActions>
84+
<Trigger.ExitActions>
85+
<RemoveStoryboard BeginStoryboardName="BeginStoryboardOnLoadedNoAnimation" />
86+
</Trigger.ExitActions>
7787
</Trigger>
88+
<MultiTrigger>
89+
<MultiTrigger.Conditions>
90+
<Condition Property="IsVisible" Value="True" />
91+
<Condition Property="wpf:TransitionAssist.DisableTransitions" Value="False" />
92+
</MultiTrigger.Conditions>
93+
<MultiTrigger.EnterActions>
94+
<BeginStoryboard Storyboard="{StaticResource OnLoaded}" Name="BeginStoryboardOnLoaded" />
95+
</MultiTrigger.EnterActions>
96+
<MultiTrigger.ExitActions>
97+
<RemoveStoryboard BeginStoryboardName="BeginStoryboardOnLoaded" />
98+
</MultiTrigger.ExitActions>
99+
</MultiTrigger>
78100
<Trigger Property="Orientation" Value="Vertical">
79101
<Setter Property="LayoutTransform" TargetName="TemplateRoot">
80102
<Setter.Value>

0 commit comments

Comments
 (0)