Skip to content

Commit a4451d5

Browse files
l1pton17l1pton17
committed
Merge remote-tracking branch 'refs/remotes/ButchersBoy/master' into FloatingHintStyles
2 parents 4f86c9b + 20d3ac9 commit a4451d5

13 files changed

+170
-132
lines changed

‎MainDemo.Wpf/Buttons.xaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,15 @@
122122
ToolTip="Resource name: MaterialDesignRaisedAccentButton">
123123
ACCENT
124124
</Button>
125+
125126
</StackPanel>
126-
<StackPanel Grid.Row="3" Margin="256 16 0 0" Orientation="Horizontal">
127-
<Button Style="{StaticResource MaterialDesignFlatButton}" Click="ButtonBase_OnClick" ToolTip="MaterialDesignFlatButton">ACCEPT</Button>
127+
<StackPanel Grid.Row="3" Margin="0 16 0 0" Orientation="Horizontal">
128+
<Button Style="{StaticResource MaterialDesignRaisedAccentButton}"
129+
Margin="0 0 8 0"
130+
Width="150"
131+
ToolTip="Resource name: MaterialDesignRaisedAccentButton"
132+
materialDesign:RippleAssist.Feedback="#DD000000">CUSTOM RIPPLE</Button>
133+
<Button Style="{StaticResource MaterialDesignFlatButton}" Click="ButtonBase_OnClick" ToolTip="MaterialDesignFlatButton" Margin="200 0 0 0">ACCEPT</Button>
128134
<Button Style="{StaticResource MaterialDesignFlatButton}" ToolTip="MaterialDesignFlatButton">CANCEL</Button>
129135
</StackPanel>
130136
<TextBlock Margin="0 24 0 0" Grid.Row="4">Toggles</TextBlock>

‎MainDemo.Wpf/TransitionsDemo/Slide5_TransitioningContent.xaml

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -106,88 +106,7 @@
106106
</materialDesign:TransitioningContent>
107107

108108
</ItemsControl>
109-
<!--
110-
<UniformGrid Grid.Row="1" Columns="4">
111-
<UniformGrid.Resources>
112-
<Style TargetType="{x:Type materialDesign:ColorZone}" BasedOn="{StaticResource {x:Type materialDesign:ColorZone}}">
113-
<Setter Property="Width" Value="96" />
114-
<Setter Property="Height" Value="96" />
115-
<Setter Property="Margin" Value="4" />
116-
<Setter Property="Mode" Value="PrimaryLight" />
117-
</Style>
118-
</UniformGrid.Resources>
119-
120-
<materialDesign:TransitioningContent OpeningEffect="{materialDesign:TransitionEffect ExpandIn}">
121-
<materialDesign:ColorZone>
122-
<materialDesign:PackIcon Kind="Phone" VerticalAlignment="Center" HorizontalAlignment="Center" />
123-
</materialDesign:ColorZone>
124-
</materialDesign:TransitioningContent>
125-
126-
<materialDesign:TransitioningContent>
127-
<materialDesign:TransitioningContent.OpeningEffects>
128-
<materialDesign:TransitionEffect Kind="ExpandIn" OffsetTime="0:0:0.05" />
129-
</materialDesign:TransitioningContent.OpeningEffects>
130-
<materialDesign:ColorZone>
131-
<materialDesign:PackIcon Kind="Phone" VerticalAlignment="Center" HorizontalAlignment="Center" />
132-
</materialDesign:ColorZone>
133-
</materialDesign:TransitioningContent>
134-
135-
<materialDesign:TransitioningContent>
136-
<materialDesign:TransitioningContent.OpeningEffects>
137-
<materialDesign:TransitionEffect Kind="ExpandIn" OffsetTime="0:0:0.1" />
138-
</materialDesign:TransitioningContent.OpeningEffects>
139-
<materialDesign:ColorZone>
140-
<materialDesign:PackIcon Kind="Phone" VerticalAlignment="Center" HorizontalAlignment="Center" />
141-
</materialDesign:ColorZone>
142-
</materialDesign:TransitioningContent>
143-
144-
<materialDesign:TransitioningContent>
145-
<materialDesign:TransitioningContent.OpeningEffects>
146-
<materialDesign:TransitionEffect Kind="ExpandIn" OffsetTime="0:0:0.15" />
147-
</materialDesign:TransitioningContent.OpeningEffects>
148-
<materialDesign:ColorZone>
149-
<materialDesign:PackIcon Kind="Phone" VerticalAlignment="Center" HorizontalAlignment="Center" />
150-
</materialDesign:ColorZone>
151-
</materialDesign:TransitioningContent>
152-
153-
<materialDesign:TransitioningContent>
154-
<materialDesign:TransitioningContent.OpeningEffects>
155-
<materialDesign:TransitionEffect Kind="ExpandIn" OffsetTime="0:0:0.2" />
156-
</materialDesign:TransitioningContent.OpeningEffects>
157-
<materialDesign:ColorZone>
158-
<materialDesign:PackIcon Kind="Phone" VerticalAlignment="Center" HorizontalAlignment="Center" />
159-
</materialDesign:ColorZone>
160-
</materialDesign:TransitioningContent>
161-
162-
<materialDesign:TransitioningContent>
163-
<materialDesign:TransitioningContent.OpeningEffects>
164-
<materialDesign:TransitionEffect Kind="ExpandIn" OffsetTime="0:0:0.25" />
165-
</materialDesign:TransitioningContent.OpeningEffects>
166-
<materialDesign:ColorZone>
167-
<materialDesign:PackIcon Kind="Phone" VerticalAlignment="Center" HorizontalAlignment="Center" />
168-
</materialDesign:ColorZone>
169-
</materialDesign:TransitioningContent>
170-
171-
<materialDesign:TransitioningContent>
172-
<materialDesign:TransitioningContent.OpeningEffects>
173-
<materialDesign:TransitionEffect Kind="ExpandIn" OffsetTime="0:0:0.3" />
174-
</materialDesign:TransitioningContent.OpeningEffects>
175-
<materialDesign:ColorZone>
176-
<materialDesign:PackIcon Kind="Phone" VerticalAlignment="Center" HorizontalAlignment="Center" />
177-
</materialDesign:ColorZone>
178-
</materialDesign:TransitioningContent>
179-
180-
<materialDesign:TransitioningContent>
181-
<materialDesign:TransitioningContent.OpeningEffects>
182-
<materialDesign:TransitionEffect Kind="ExpandIn" OffsetTime="0:0:0.35" />
183-
</materialDesign:TransitioningContent.OpeningEffects>
184-
<materialDesign:ColorZone>
185-
<materialDesign:PackIcon Kind="Phone" VerticalAlignment="Center" HorizontalAlignment="Center" />
186-
</materialDesign:ColorZone>
187-
</materialDesign:TransitioningContent>
188-
189-
</UniformGrid>
190-
-->
109+
191110
<StackPanel Orientation="Horizontal" Grid.Row="2" HorizontalAlignment="Right">
192111
<Button Style="{DynamicResource MaterialDesignFloatingActionMiniButton}"
193112
Command="{x:Static materialDesign:Transitioner.MovePreviousCommand}"

‎MainDemo.Wpf/Typography.xaml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
mc:Ignorable="d"
77
d:DesignHeight="300" d:DesignWidth="300">
88
<UserControl.Resources>
9-
<Style TargetType="TextBlock" BasedOn="{StaticResource MaterialDesignCaptionTextBlock}">
9+
<Style TargetType="TextBlock" BasedOn="{StaticResource MaterialDesignCaptionTextBlock}" x:Key="Caption">
1010
<Setter Property="Opacity" Value=".68"></Setter>
1111
</Style>
1212
</UserControl.Resources>
@@ -33,47 +33,49 @@
3333
<RowDefinition Height="Auto" />
3434
<RowDefinition Height="Auto" />
3535
</Grid.RowDefinitions>
36-
<TextBlock Grid.Row="0" Grid.Column="0" Margin="0 26 0 0">Display 4 - MaterialDesignDisplay4TextBlock</TextBlock>
36+
<TextBlock Grid.Row="0" Grid.Column="0" Margin="0 26 0 0" Style="{StaticResource Caption}">Display 4 - MaterialDesignDisplay4TextBlock</TextBlock>
3737
<TextBlock Grid.Row="0" Grid.Column="2" Style="{StaticResource MaterialDesignDisplay4TextBlock}" Margin="0 4 0 4">Light 112sp</TextBlock>
38-
<TextBlock Grid.Row="0" Grid.Column="4" Margin="0 4 0 4"><Hyperlink IsEnabled="False" Style="{StaticResource MaterialDesignDisplay4Hyperlink}">Light 112sp (Disabled)</Hyperlink></TextBlock>
38+
<TextBlock Grid.Row="0" Grid.Column="4" Style="{StaticResource MaterialDesignDisplay4TextBlock}" Margin="0 4 0 4"><Hyperlink IsEnabled="False">Light 112sp (Disabled)</Hyperlink></TextBlock>
3939

40-
<TextBlock Grid.Row="1" Grid.Column="0" Margin="0 12 0 0">Display 3 - MaterialDesignDisplay3TextBlock</TextBlock>
40+
<TextBlock Grid.Row="1" Grid.Column="0" Margin="0 12 0 0" Style="{StaticResource Caption}">Display 3 - MaterialDesignDisplay3TextBlock</TextBlock>
4141
<TextBlock Grid.Row="1" Grid.Column="2" Style="{StaticResource MaterialDesignDisplay3TextBlock}" Margin="0 4 0 4">Regular 56sp</TextBlock>
42-
<TextBlock Grid.Row="1" Grid.Column="4" Margin="0 4 0 4"><Hyperlink Style="{StaticResource MaterialDesignDisplay3Hyperlink}">Regular 56sp</Hyperlink></TextBlock>
42+
<!-- hyperlinks will pick up owner text block style... -->
43+
<TextBlock Grid.Row="1" Grid.Column="4" Style="{StaticResource MaterialDesignDisplay3TextBlock}" Margin="0 4 0 4"><Hyperlink>Regular 56sp</Hyperlink></TextBlock>
4344

44-
<TextBlock Grid.Row="2" Grid.Column="0" Margin="0 8 0 0">Display 2 - MaterialDesignDisplay2TextBlock</TextBlock>
45+
<TextBlock Grid.Row="2" Grid.Column="0" Margin="0 8 0 0" Style="{StaticResource Caption}">Display 2 - MaterialDesignDisplay2TextBlock</TextBlock>
4546
<TextBlock Grid.Row="2" Grid.Column="2" Style="{StaticResource MaterialDesignDisplay2TextBlock}" Margin="0 4 0 4">Regular 45sp</TextBlock>
47+
<!-- ...or hyperlink style can be ste manually -->
4648
<TextBlock Grid.Row="2" Grid.Column="4" Margin="0 4 0 4"><Hyperlink Style="{StaticResource MaterialDesignDisplay2Hyperlink}">Regular 45sp</Hyperlink></TextBlock>
4749

48-
<TextBlock Grid.Row="3" Grid.Column="0" Margin="0 8 0 0">Display 1 - MaterialDesignDisplay1TextBlock</TextBlock>
50+
<TextBlock Grid.Row="3" Grid.Column="0" Margin="0 8 0 0" Style="{StaticResource Caption}">Display 1 - MaterialDesignDisplay1TextBlock</TextBlock>
4951
<TextBlock Grid.Row="3" Grid.Column="2" Style="{StaticResource MaterialDesignDisplay1TextBlock}" Margin="0 4 0 4">Regular 34sp</TextBlock>
5052
<TextBlock Grid.Row="3" Grid.Column="4" Margin="0 4 0 4"><Hyperlink Style="{StaticResource MaterialDesignDisplay1Hyperlink}">Regular 34sp</Hyperlink></TextBlock>
5153

52-
<TextBlock Grid.Row="4" Grid.Column="0" Margin="0 8 0 0">Headline - MaterialDesignHeadlineTextBlock</TextBlock>
54+
<TextBlock Grid.Row="4" Grid.Column="0" Margin="0 8 0 0" Style="{StaticResource Caption}">Headline - MaterialDesignHeadlineTextBlock</TextBlock>
5355
<TextBlock Grid.Row="4" Grid.Column="2" Style="{StaticResource MaterialDesignHeadlineTextBlock}" Margin="0 4 0 6">Regular 24sp</TextBlock>
5456
<TextBlock Grid.Row="4" Grid.Column="4" Margin="0 4 0 4"><Hyperlink IsEnabled="False" Style="{StaticResource MaterialDesignHeadlineHyperlink}">Regular 24sp (Disabled)</Hyperlink></TextBlock>
5557

56-
<TextBlock Grid.Row="5" Grid.Column="0" Margin="0 8 0 0">Title - MaterialDesignTitleTextBlock</TextBlock>
58+
<TextBlock Grid.Row="5" Grid.Column="0" Margin="0 8 0 0" Style="{StaticResource Caption}">Title - MaterialDesignTitleTextBlock</TextBlock>
5759
<TextBlock Grid.Row="5" Grid.Column="2" Style="{StaticResource MaterialDesignTitleTextBlock}" Margin="0 6 0 8">Medium 20sp</TextBlock>
5860
<TextBlock Grid.Row="5" Grid.Column="4" Margin="0 4 0 4"><Hyperlink Style="{StaticResource MaterialDesignTitleHyperlink}">Medium 20sp</Hyperlink></TextBlock>
5961

60-
<TextBlock Grid.Row="6" Grid.Column="0" VerticalAlignment="Center">Subheading - MaterialDesignSubheadingTextBlock</TextBlock>
62+
<TextBlock Grid.Row="6" Grid.Column="0" VerticalAlignment="Center" Style="{StaticResource Caption}">Subheading - MaterialDesignSubheadingTextBlock</TextBlock>
6163
<TextBlock Grid.Row="6" Grid.Column="2" Style="{StaticResource MaterialDesignSubheadingTextBlock}" Margin="0 8 0 8">Regular 15sp</TextBlock>
6264
<TextBlock Grid.Row="6" Grid.Column="4" Margin="0 4 0 4"><Hyperlink Style="{StaticResource MaterialDesignSubheadingHyperlink}">Regular 15sp</Hyperlink></TextBlock>
6365

64-
<TextBlock Grid.Row="7" Grid.Column="0" VerticalAlignment="Center">Body 2 - MaterialDesignBody2TextBlock</TextBlock>
66+
<TextBlock Grid.Row="7" Grid.Column="0" VerticalAlignment="Center" Style="{StaticResource Caption}">Body 2 - MaterialDesignBody2TextBlock</TextBlock>
6567
<TextBlock Grid.Row="7" Grid.Column="2" Style="{StaticResource MaterialDesignBody2TextBlock}" Margin="0 8 0 8">Medium 13sp</TextBlock>
6668
<TextBlock Grid.Row="7" Grid.Column="4" Margin="0 4 0 4"><Hyperlink Style="{StaticResource MaterialDesignBody2Hyperlink}">Medium 13sp</Hyperlink></TextBlock>
6769

68-
<TextBlock Grid.Row="8" Grid.Column="0" VerticalAlignment="Center">Body 1 - MaterialDesignBody1TextBlock</TextBlock>
70+
<TextBlock Grid.Row="8" Grid.Column="0" VerticalAlignment="Center" Style="{StaticResource Caption}">Body 1 - MaterialDesignBody1TextBlock</TextBlock>
6971
<TextBlock Grid.Row="8" Grid.Column="2" Style="{StaticResource MaterialDesignBody1TextBlock}" Margin="0 8 0 8">Regular 13sp</TextBlock>
7072
<TextBlock Grid.Row="8" Grid.Column="4" Margin="0 4 0 4"><Hyperlink IsEnabled="False" Style="{StaticResource MaterialDesignBody1Hyperlink}">Regular 13sp (Disabled)</Hyperlink></TextBlock>
7173

72-
<TextBlock Grid.Row="9" Grid.Column="0" VerticalAlignment="Center">Caption - MaterialDesignCaptionTextBlock</TextBlock>
74+
<TextBlock Grid.Row="9" Grid.Column="0" VerticalAlignment="Center" Style="{StaticResource Caption}">Caption - MaterialDesignCaptionTextBlock</TextBlock>
7375
<TextBlock Grid.Row="9" Grid.Column="2" Style="{StaticResource MaterialDesignCaptionTextBlock}" Margin="0 8 0 8">Regular 12sp</TextBlock>
7476
<TextBlock Grid.Row="9" Grid.Column="4" Margin="0 4 0 4"><Hyperlink Style="{StaticResource MaterialDesignCaptionHyperlink}">Regular 12sp</Hyperlink></TextBlock>
7577

76-
<TextBlock Grid.Row="10" Grid.Column="0" VerticalAlignment="Center">Button - MaterialDesignButtonTextBlock</TextBlock>
78+
<TextBlock Grid.Row="10" Grid.Column="0" VerticalAlignment="Center" Style="{StaticResource Caption}">Button - MaterialDesignButtonTextBlock</TextBlock>
7779
<TextBlock Grid.Row="10" Grid.Column="2" Style="{StaticResource MaterialDesignButtonTextBlock}" Margin="0 8 0 8">MEDIUM (ALL CAPS) 14sp</TextBlock>
7880

7981
</Grid>

‎MaterialDesignThemes.Wpf/PackIconDataFactory.cs

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)