Skip to content

Commit 52b37d8

Browse files
ButchersBoyButchersBoy
committed
refactoring to allow more wipes
1 parent 057212a commit 52b37d8

22 files changed

+55
-36
lines changed

‎MaterialDesignThemes.Wpf/Clock.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using System.Windows.Navigation;
1616
using System.Windows.Shapes;
1717
using MaterialDesignThemes.Wpf.Converters;
18+
using MaterialDesignThemes.Wpf.Transitions;
1819

1920
namespace MaterialDesignThemes.Wpf
2021
{

‎MaterialDesignThemes.Wpf/DialogHost.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using System.Windows.Data;
1010
using System.Windows.Input;
1111
using System.Windows.Threading;
12+
using MaterialDesignThemes.Wpf.Transitions;
1213

1314
namespace MaterialDesignThemes.Wpf
1415
{

‎MaterialDesignThemes.Wpf/DrawerHost.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Windows.Controls;
44
using System.Windows.Input;
55
using System.Windows.Media;
6+
using MaterialDesignThemes.Wpf.Transitions;
67

78
namespace MaterialDesignThemes.Wpf
89
{

‎MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,9 @@
255255
<Compile Include="Extensions.cs" />
256256
<Compile Include="Icon.cs" />
257257
<Compile Include="IconType.cs" />
258-
<Compile Include="ITransitionEffect.cs" />
259-
<Compile Include="ITransitionEffectSubject.cs" />
258+
<Compile Include="Transitions\ITransitionEffect.cs" />
259+
<Compile Include="Transitions\ITransitionEffectSubject.cs" />
260+
<Compile Include="Transitions\ITransitionWipe.cs" />
260261
<Compile Include="ListSortDirectionIndicator.cs" />
261262
<Compile Include="MaterialDataGridComboBoxColumn.cs" />
262263
<Compile Include="MaterialDataGridTextColumn.cs" />
@@ -290,17 +291,17 @@
290291
<Compile Include="ToolTipAssist.cs" />
291292
<Compile Include="RippleAssist.cs" />
292293
<Compile Include="Ripple.cs" />
293-
<Compile Include="TransitionAssist.cs" />
294-
<Compile Include="TransitionEffect.cs" />
295-
<Compile Include="TransitionEffectBase.cs" />
296-
<Compile Include="TransitionEffectExtension.cs" />
297-
<Compile Include="TransitionEffectKind.cs" />
298-
<Compile Include="TransitionEffectTypeConverter.cs" />
299-
<Compile Include="Transitioner.cs" />
300-
<Compile Include="TransitionerSlide.cs" />
301-
<Compile Include="TransitionerSlideState.cs" />
302-
<Compile Include="TransitioningContent.cs" />
303-
<Compile Include="TransitioningContentBase.cs" />
294+
<Compile Include="Transitions\TransitionAssist.cs" />
295+
<Compile Include="Transitions\TransitionEffect.cs" />
296+
<Compile Include="Transitions\TransitionEffectBase.cs" />
297+
<Compile Include="Transitions\TransitionEffectExtension.cs" />
298+
<Compile Include="Transitions\TransitionEffectKind.cs" />
299+
<Compile Include="Transitions\TransitionEffectTypeConverter.cs" />
300+
<Compile Include="Transitions\Transitioner.cs" />
301+
<Compile Include="Transitions\TransitionerSlide.cs" />
302+
<Compile Include="Transitions\TransitionerSlideState.cs" />
303+
<Compile Include="Transitions\TransitioningContent.cs" />
304+
<Compile Include="Transitions\TransitioningContentBase.cs" />
304305
<Compile Include="TreeHelper.cs" />
305306
<Compile Include="Underline.cs" />
306307
<Compile Include="ValidationAssist.cs" />

‎MaterialDesignThemes.Wpf/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
[assembly: AssemblyCulture("")]
1919
[assembly: XmlnsPrefix("http://materialdesigninxaml.net/winfx/xaml/themes", "materialDesign")]
2020
[assembly: XmlnsDefinition("http://materialdesigninxaml.net/winfx/xaml/themes", "MaterialDesignThemes.Wpf")]
21+
[assembly: XmlnsDefinition("http://materialdesigninxaml.net/winfx/xaml/themes", "MaterialDesignThemes.Wpf.Transitions")]
2122

2223
// Setting ComVisible to false makes the types in this assembly not visible
2324
// to COM components. If you need to access a type in this assembly from

‎MaterialDesignThemes.Wpf/Themes/Generic.xaml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:local="clr-namespace:MaterialDesignThemes.Wpf"
55
xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
6-
xmlns:controlzEx="clr-namespace:ControlzEx">
6+
xmlns:controlzEx="clr-namespace:ControlzEx"
7+
xmlns:transitions="clr-namespace:MaterialDesignThemes.Wpf.Transitions">
78

89
<ResourceDictionary.MergedDictionaries>
910
<!-- we only bring in the dictionaries for controls which were "invented"
@@ -807,7 +808,7 @@
807808
</Setter>
808809
</Style>
809810

810-
<Style TargetType="{x:Type local:Transitioner}">
811+
<Style TargetType="{x:Type transitions:Transitioner}">
811812
<Setter Property="ItemsPanel">
812813
<Setter.Value>
813814
<ItemsPanelTemplate>
@@ -817,7 +818,7 @@
817818
</Setter>
818819
<Setter Property="Template">
819820
<Setter.Value>
820-
<ControlTemplate TargetType="{x:Type local:Transitioner}">
821+
<ControlTemplate TargetType="{x:Type transitions:Transitioner}">
821822
<Border Background="{TemplateBinding Background}"
822823
BorderBrush="{TemplateBinding BorderBrush}"
823824
BorderThickness="{TemplateBinding BorderThickness}">
@@ -833,11 +834,11 @@
833834
</Setter>
834835
</Style>
835836

836-
<Style TargetType="{x:Type local:TransitioningContentBase}">
837+
<Style TargetType="{x:Type transitions:TransitioningContentBase}">
837838

838839
<Setter Property="Template">
839840
<Setter.Value>
840-
<ControlTemplate TargetType="{x:Type local:TransitioningContentBase}">
841+
<ControlTemplate TargetType="{x:Type transitions:TransitioningContentBase}">
841842
<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"
842843
x:Name="Border">
843844
<ContentPresenter
@@ -864,9 +865,9 @@
864865
</Setter>
865866
</Style>
866867

867-
<Style TargetType="{x:Type local:TransitioningContent}" BasedOn="{StaticResource {x:Type local:TransitioningContentBase}}" />
868+
<Style TargetType="{x:Type transitions:TransitioningContent}" BasedOn="{StaticResource {x:Type transitions:TransitioningContentBase}}" />
868869

869-
<Style TargetType="{x:Type local:TransitionerSlide}" BasedOn="{StaticResource {x:Type local:TransitioningContentBase}}">
870+
<Style TargetType="{x:Type transitions:TransitionerSlide}" BasedOn="{StaticResource {x:Type transitions:TransitioningContentBase}}">
870871
<Setter Property="IsEnabled" Value="False" />
871872
<Setter Property="Visibility" Value="Hidden" />
872873
<Style.Triggers>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:circularProgressBar="clr-namespace:MaterialDesignThemes.Wpf.Converters.CircularProgressBar"
4-
xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
4+
xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf"
5+
xmlns:transitions="clr-namespace:MaterialDesignThemes.Wpf.Transitions">
56

67
<Style x:Key="MaterialDesignLinearProgressBar" TargetType="{x:Type ProgressBar}">
78
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkBrush}"/>
@@ -77,7 +78,7 @@
7778
</Grid>
7879
</Grid>
7980
<ControlTemplate.Triggers>
80-
<Trigger Property="wpf:TransitionAssist.DisableTransitions" Value="True">
81+
<Trigger Property="transitions:TransitionAssist.DisableTransitions" Value="True">
8182
<Trigger.EnterActions>
8283
<BeginStoryboard Storyboard="{StaticResource OnLoadedNoAnimation}" Name="BeginStoryboardOnLoadedNoAnimation" />
8384
</Trigger.EnterActions>
@@ -88,7 +89,7 @@
8889
<MultiTrigger>
8990
<MultiTrigger.Conditions>
9091
<Condition Property="IsVisible" Value="True" />
91-
<Condition Property="wpf:TransitionAssist.DisableTransitions" Value="False" />
92+
<Condition Property="transitions:TransitionAssist.DisableTransitions" Value="False" />
9293
</MultiTrigger.Conditions>
9394
<MultiTrigger.EnterActions>
9495
<BeginStoryboard Storyboard="{StaticResource OnLoaded}" Name="BeginStoryboardOnLoaded" />

MaterialDesignThemes.Wpf/ITransitionEffect.cs renamed to MaterialDesignThemes.Wpf/Transitions/ITransitionEffect.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Windows;
22
using System.Windows.Media.Animation;
33

4-
namespace MaterialDesignThemes.Wpf
4+
namespace MaterialDesignThemes.Wpf.Transitions
55
{
66
public interface ITransitionEffect
77
{

MaterialDesignThemes.Wpf/ITransitionEffectSubject.cs renamed to MaterialDesignThemes.Wpf/Transitions/ITransitionEffectSubject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace MaterialDesignThemes.Wpf
1+
namespace MaterialDesignThemes.Wpf.Transitions
22
{
33
public interface ITransitionEffectSubject
44
{

‎MaterialDesignThemes.Wpf/Transitions/ITransitionWipe.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
namespace MaterialDesignThemes.Wpf.Transitions
2+
{
3+
public interface ITransitionWipe
4+
{
5+
bool IsDestinationTopmostForDuration { get; }
6+
7+
void Wipe(TransitionerSlide from, TransitionerSlide to);
8+
}
9+
}

0 commit comments

Comments
 (0)