Skip to content

Commit c1b68c4

Browse files
ButchersBoyButchersBoy
committed
incorporate new transiions demo into main slides
1 parent a895a43 commit c1b68c4

File tree

8 files changed

+73
-60
lines changed

8 files changed

+73
-60
lines changed

‎MainDemo.Wpf/MaterialDesignDemo.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,11 @@
188188
<Compile Include="TransitionsDemo\Slide5_TransitioningContent.xaml.cs">
189189
<DependentUpon>Slide5_TransitioningContent.xaml</DependentUpon>
190190
</Compile>
191-
<Compile Include="TransitionsDemo\Slide6_MVVM.xaml.cs">
192-
<DependentUpon>Slide6_MVVM.xaml</DependentUpon>
191+
<Compile Include="TransitionsDemo\Slide7_MVVM.xaml.cs">
192+
<DependentUpon>Slide7_MVVM.xaml</DependentUpon>
193193
</Compile>
194-
<Compile Include="TransitionsDemo\Slide7_Master.xaml.cs">
195-
<DependentUpon>Slide7_Master.xaml</DependentUpon>
194+
<Compile Include="TransitionsDemo\Slide6_Origins.xaml.cs">
195+
<DependentUpon>Slide6_Origins.xaml</DependentUpon>
196196
</Compile>
197197
<Compile Include="TransitionsDemo\Slide7_MasterModel.cs" />
198198
<Compile Include="TransitionsDemo\Slide8_Details.xaml.cs">
@@ -351,11 +351,11 @@
351351
<SubType>Designer</SubType>
352352
<Generator>MSBuild:Compile</Generator>
353353
</Page>
354-
<Page Include="TransitionsDemo\Slide6_MVVM.xaml">
354+
<Page Include="TransitionsDemo\Slide7_MVVM.xaml">
355355
<SubType>Designer</SubType>
356356
<Generator>MSBuild:Compile</Generator>
357357
</Page>
358-
<Page Include="TransitionsDemo\Slide7_Master.xaml">
358+
<Page Include="TransitionsDemo\Slide6_Origins.xaml">
359359
<SubType>Designer</SubType>
360360
<Generator>MSBuild:Compile</Generator>
361361
</Page>

‎MainDemo.Wpf/TransitionsDemo/Slide6_Origins.xaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<UserControl x:Class="MaterialDesignDemo.TransitionsDemo.Slide6_Origins"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:local="clr-namespace:MaterialDesignDemo.TransitionsDemo"
7+
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
8+
mc:Ignorable="d"
9+
d:DesignHeight="300" d:DesignWidth="300">
10+
<Grid>
11+
<Grid.RowDefinitions>
12+
<RowDefinition />
13+
<RowDefinition />
14+
</Grid.RowDefinitions>
15+
<Grid.ColumnDefinitions>
16+
<ColumnDefinition Width="Auto"/>
17+
<ColumnDefinition/>
18+
</Grid.ColumnDefinitions>
19+
<materialDesign:Transitioner Name="Transitioner" Grid.Column="1" SelectedIndex="0" DefaultTransitionOrigin="1, 1">
20+
<Border Background="#009688">
21+
<TextBlock Foreground="Azure" Margin="24" TextWrapping="Wrap">You can set .DefaultTransitionOrigin, to help with transitions such as the circle wipe, which are triggered from code.</TextBlock>
22+
</Border>
23+
<materialDesign:TransitionerSlide TransitionOrigin="0.25, 0.25">
24+
<materialDesign:TransitionerSlide.BackwardWipe>
25+
<materialDesign:CircleWipe/>
26+
</materialDesign:TransitionerSlide.BackwardWipe>
27+
<Border Background="#E64A19"/>
28+
</materialDesign:TransitionerSlide>
29+
</materialDesign:Transitioner>
30+
<StackPanel Margin="16 0 16 0">
31+
<Button Click="FirstSlideButton_OnClick">First</Button>
32+
<Button Click="SecondSlideButton_OnClick" Margin="0 16 0 0">Second</Button>
33+
</StackPanel>
34+
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.ColumnSpan="2" Margin="16" HorizontalAlignment="Right">
35+
<Button Style="{DynamicResource MaterialDesignFloatingActionMiniButton}"
36+
Command="{x:Static materialDesign:Transitioner.MovePreviousCommand}"
37+
>
38+
<materialDesign:PackIcon Kind="StepBackward" />
39+
</Button>
40+
<Button Style="{DynamicResource MaterialDesignFloatingActionMiniButton}"
41+
Command="{x:Static materialDesign:Transitioner.MoveNextCommand}"
42+
Margin="16 0 0 0">
43+
<materialDesign:PackIcon Kind="StepForward" />
44+
</Button>
45+
</StackPanel>
46+
</Grid>
47+
</UserControl>

MainDemo.Wpf/TransitionsDemo/Slide7_Master.xaml.cs renamed to MainDemo.Wpf/TransitionsDemo/Slide6_Origins.xaml.cs

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,23 @@
1616
namespace MaterialDesignDemo.TransitionsDemo
1717
{
1818
/// <summary>
19-
/// Interaction logic for Slide7_Master.xaml
19+
/// Interaction logic for Slide6_Origins.xaml
2020
/// </summary>
21-
public partial class Slide7_Master : UserControl
21+
public partial class Slide6_Origins : UserControl
2222
{
23-
public Slide7_Master()
23+
public Slide6_Origins()
2424
{
2525
InitializeComponent();
2626
}
27+
28+
private void FirstSlideButton_OnClick(object sender, RoutedEventArgs e)
29+
{
30+
Transitioner.SelectedIndex = 0;
31+
}
32+
33+
private void SecondSlideButton_OnClick(object sender, RoutedEventArgs e)
34+
{
35+
Transitioner.SelectedIndex = 1;
36+
}
2737
}
2838
}

MainDemo.Wpf/TransitionsDemo/Slide6_MVVM.xaml renamed to MainDemo.Wpf/TransitionsDemo/Slide7_MVVM.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<UserControl x:Class="MaterialDesignDemo.TransitionsDemo.Slide6_MVVM"
1+
<UserControl x:Class="MaterialDesignDemo.TransitionsDemo.Slide7_MVVM"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

MainDemo.Wpf/TransitionsDemo/Slide6_MVVM.xaml.cs renamed to MainDemo.Wpf/TransitionsDemo/Slide7_MVVM.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
namespace MaterialDesignDemo.TransitionsDemo
1717
{
1818
/// <summary>
19-
/// Interaction logic for Slide6_MVVM.xaml
19+
/// Interaction logic for Slide7_MVVM.xaml
2020
/// </summary>
21-
public partial class Slide6_MVVM : UserControl
21+
public partial class Slide7_MVVM : UserControl
2222
{
23-
public Slide6_MVVM()
23+
public Slide7_MVVM()
2424
{
2525
InitializeComponent();
2626
}

‎MainDemo.Wpf/TransitionsDemo/Slide7_Master.xaml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎MainDemo.Wpf/TransitionsDemo/TransitionsDemoHome.xaml‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -47,32 +47,12 @@
4747

4848
<local:Slide5_TransitioningContent />
4949

50-
<local:Slide6_MVVM />
51-
52-
<local:Slide7_Master />
53-
54-
<local:Slide8_Details />
50+
<local:Slide6_Origins />
51+
52+
<local:Slide7_MVVM />
5553

5654
</materialDesign:Transitioner>
5755

58-
<Grid Grid.Row="2">
59-
<Grid.ColumnDefinitions>
60-
<ColumnDefinition Width="Auto"/>
61-
<ColumnDefinition/>
62-
</Grid.ColumnDefinitions>
63-
<materialDesign:Transitioner Name="BackgroundTransitioner" Grid.Column="1" Margin="6" SelectedIndex="1" DefaultTransitionOrigin="0, 0">
64-
<Border Background="#009688"/>
65-
<materialDesign:TransitionerSlide TransitionOrigin="0, 1">
66-
<materialDesign:TransitionerSlide.BackwardWipe>
67-
<materialDesign:CircleWipe/>
68-
</materialDesign:TransitionerSlide.BackwardWipe>
69-
<Border Background="#E64A19"/>
70-
</materialDesign:TransitionerSlide>
71-
</materialDesign:Transitioner>
72-
<ToggleButton Name="BackgroundToggleButton" Grid.Column="0" Margin="6" Click="BackgroundToggleButton_Checked"/>
73-
<TextBlock Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Style="{StaticResource MaterialDesignDisplay3TextBlock}" Foreground="{StaticResource PrimaryHueDarkForegroundBrush}" Opacity="0.86">Material Design In XAML Toolkit</TextBlock>
74-
</Grid>
75-
7656
</Grid>
7757

7858
</UserControl>

‎MainDemo.Wpf/TransitionsDemo/TransitionsDemoHome.xaml.cs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,5 @@ public TransitionsDemoHome()
2424
{
2525
InitializeComponent();
2626
}
27-
28-
private void BackgroundToggleButton_Checked(object sender, RoutedEventArgs e)
29-
{
30-
if((bool)BackgroundToggleButton.IsChecked)
31-
{
32-
BackgroundTransitioner.SelectedIndex = 0;
33-
}
34-
else
35-
{
36-
BackgroundTransitioner.SelectedIndex = 1;
37-
}
38-
}
3927
}
4028
}

0 commit comments

Comments
 (0)