Skip to content

Commit 688c764

Browse files
spiegelpspiegelp
committed
Merge pull request #13 from ButchersBoy/master
update from original repo
2 parents 34cd890 + 99dff8a commit 688c764

File tree

7 files changed

+426
-87
lines changed

7 files changed

+426
-87
lines changed

‎MainDemo.Wpf/Buttons.xaml

Lines changed: 125 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ListBox.xaml" />
1717
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.PopupBox.xaml" />
1818
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.RadioButton.xaml" />
19+
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBlock.xaml" />
1920
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ToggleButton.xaml" />
2021
</ResourceDictionary.MergedDictionaries>
2122
</ResourceDictionary>
@@ -30,13 +31,10 @@
3031
<RowDefinition Height="Auto" />
3132
<RowDefinition Height="Auto" />
3233
<RowDefinition Height="Auto" />
33-
<RowDefinition Height="Auto" />
34-
<RowDefinition Height="Auto" />
35-
<RowDefinition Height="Auto" />
3634
</Grid.RowDefinitions>
37-
<TextBlock>Buttons</TextBlock>
35+
<TextBlock Style="{StaticResource MaterialDesignHeadlineTextBlock}">Buttons</TextBlock>
3836
<Grid Grid.Row="1" >
39-
<StackPanel Orientation="Horizontal" Margin="0 24 0 0">
37+
<StackPanel Orientation="Horizontal" Margin="0 12 0 0">
4038
<Button Style="{StaticResource MaterialDesignFloatingActionMiniLightButton}"
4139
Margin="0 0 8 0" HorizontalAlignment="Left"
4240
ToolTip="MaterialDesignFloatingActionMiniLightButton">
@@ -171,7 +169,7 @@
171169
</Button>
172170

173171
</StackPanel>
174-
<StackPanel Grid.Row="3" Margin="0 16 0 0" Orientation="Horizontal">
172+
<StackPanel Grid.Row="3" Margin="0 24 0 0" Orientation="Horizontal">
175173
<Button Style="{StaticResource MaterialDesignRaisedAccentButton}"
176174
Margin="0 0 8 0"
177175
Width="150"
@@ -180,88 +178,147 @@
180178
<Button Style="{StaticResource MaterialDesignFlatButton}" Click="ButtonBase_OnClick" ToolTip="MaterialDesignFlatButton" Margin="200 0 0 0">ACCEPT</Button>
181179
<Button Style="{StaticResource MaterialDesignFlatButton}" ToolTip="MaterialDesignFlatButton">CANCEL</Button>
182180
</StackPanel>
183-
<TextBlock Margin="0 24 0 0" Grid.Row="4">Toggles</TextBlock>
184-
<StackPanel Grid.Row="5" Margin="0 24 0 0" Orientation="Horizontal">
185-
<ToggleButton Content="C" Margin="0 0 8 8" Style="{StaticResource MaterialDesignActionLightToggleButton}" IsChecked="True"
181+
182+
<Border Margin="0 16 0 0" BorderThickness="0 1 0 0" BorderBrush="{DynamicResource MaterialDesignDivider}" Grid.Row="4" />
183+
<TextBlock Margin="0 32 0 24" Grid.Row="4" Style="{StaticResource MaterialDesignHeadlineTextBlock}">Toggles</TextBlock>
184+
<Grid Grid.Row="5">
185+
<Grid.RowDefinitions>
186+
<RowDefinition Height="Auto" />
187+
<RowDefinition Height="Auto" />
188+
<RowDefinition Height="Auto" />
189+
<RowDefinition Height="Auto" />
190+
</Grid.RowDefinitions>
191+
<Grid.ColumnDefinitions>
192+
<ColumnDefinition Width="1*" />
193+
<ColumnDefinition Width="1*" />
194+
</Grid.ColumnDefinitions>
195+
<StackPanel Grid.Row="0" Orientation="Horizontal">
196+
<ToggleButton Content="C" Margin="0 0 8 8" Style="{StaticResource MaterialDesignActionLightToggleButton}" IsChecked="True"
186197
ToolTip="MaterialDesignActionLightToggleButton"/>
187-
<ToggleButton Content="H" Margin="0 0 8 8" Style="{StaticResource MaterialDesignActionToggleButton}"
198+
<ToggleButton Content="H" Margin="0 0 8 8" Style="{StaticResource MaterialDesignActionToggleButton}"
188199
ToolTip="MaterialDesignActionToggleButton"/>
189-
<!-- checkbox style same as toggle button -->
190-
<CheckBox Content="E" Margin="0 0 8 8" Style="{StaticResource MaterialDesignActionDarkCheckBox}"
200+
<!-- checkbox style same as toggle button -->
201+
<CheckBox Content="E" Margin="0 0 8 8" Style="{StaticResource MaterialDesignActionDarkCheckBox}"
191202
ToolTip="MaterialDesignActionDarkCheckBox"/>
192-
<ToggleButton Content="C" Margin="0 0 8 8" Style="{StaticResource MaterialDesignActionAccentToggleButton}"
203+
<ToggleButton Content="C" Margin="0 0 8 8" Style="{StaticResource MaterialDesignActionAccentToggleButton}"
193204
IsChecked="True"
194205
ToolTip="MaterialDesignActionAccentToggleButton"/>
195-
<ToggleButton Content="K" Margin="0 0 8 8" Style="{StaticResource MaterialDesignActionToggleButton}" IsEnabled="False"
206+
<ToggleButton Content="K" Margin="0 0 8 8" Style="{StaticResource MaterialDesignActionToggleButton}" IsEnabled="False"
196207
ToolTip="MaterialDesignActionToggleButton"/>
197-
<ToggleButton Margin="0 0 8 8" Style="{StaticResource MaterialDesignActionToggleButton}"
208+
<ToggleButton Margin="0 0 8 8" Style="{StaticResource MaterialDesignActionToggleButton}"
198209
ToolTip="MaterialDesignActionToggleButton">
199-
<Image Source="Resources/ProfilePic.jpg"></Image>
200-
</ToggleButton>
201-
<TextBlock Margin="16 0 8 0" VerticalAlignment="Center">Customise On Content:</TextBlock>
202-
<ToggleButton Style="{StaticResource MaterialDesignActionToggleButton}"
210+
<Image Source="Resources/ProfilePic.jpg"></Image>
211+
</ToggleButton>
212+
<TextBlock Margin="16 0 8 0" VerticalAlignment="Center">Customise On Content:</TextBlock>
213+
<ToggleButton Style="{StaticResource MaterialDesignActionToggleButton}"
203214
ToolTip="MaterialDesignActionLightToggleButton">
204-
<ToggleButton.Content>
205-
<materialDesign:PackIcon Kind="EmoticonSad" />
206-
</ToggleButton.Content>
207-
<materialDesign:ToggleButtonAssist.OnContent>
208-
<materialDesign:PackIcon Kind="EmoticonHappy" />
209-
</materialDesign:ToggleButtonAssist.OnContent>
210-
</ToggleButton>
211-
</StackPanel>
212-
<StackPanel Grid.Row="6" Margin="0 16 0 0" Orientation="Horizontal">
213-
<RadioButton Style="{StaticResource MaterialDesignRadioButton}" Margin="0 0 8 8" VerticalAlignment="Center" IsChecked="True">
214-
Radio
215-
</RadioButton>
216-
<RadioButton Style="{StaticResource MaterialDesignRadioButton}" Margin="0 0 8 8" VerticalAlignment="Center">
217-
Ga Ga
218-
</RadioButton>
219-
<RadioButton Style="{StaticResource MaterialDesignRadioButton}" Margin="0 0 8 8" VerticalAlignment="Center"
215+
<ToggleButton.Content>
216+
<materialDesign:PackIcon Kind="EmoticonSad" />
217+
</ToggleButton.Content>
218+
<materialDesign:ToggleButtonAssist.OnContent>
219+
<materialDesign:PackIcon Kind="EmoticonHappy" />
220+
</materialDesign:ToggleButtonAssist.OnContent>
221+
</ToggleButton>
222+
</StackPanel>
223+
<StackPanel Grid.Row="1" Margin="0 16 0 0" Orientation="Horizontal">
224+
<RadioButton Style="{StaticResource MaterialDesignRadioButton}" Margin="0 0 8 8" VerticalAlignment="Center" IsChecked="True">
225+
Radio
226+
</RadioButton>
227+
<RadioButton Style="{StaticResource MaterialDesignRadioButton}" Margin="0 0 8 8" VerticalAlignment="Center">
228+
Ga Ga
229+
</RadioButton>
230+
<RadioButton Style="{StaticResource MaterialDesignRadioButton}" Margin="0 0 8 8" VerticalAlignment="Center"
220231
IsEnabled="False">
221-
Disabled
222-
</RadioButton>
223-
<CheckBox Style="{StaticResource MaterialDesignCheckBox}" Margin="0 0 8 8" VerticalAlignment="Center">
224-
Check
225-
</CheckBox>
226-
<CheckBox Style="{StaticResource MaterialDesignCheckBox}" Margin="0 0 8 8" VerticalAlignment="Center" IsChecked="True">
227-
Mate
228-
</CheckBox>
229-
<CheckBox Style="{StaticResource MaterialDesignCheckBox}" Margin="0 0 8 8" VerticalAlignment="Center"
232+
Disabled
233+
</RadioButton>
234+
<CheckBox Style="{StaticResource MaterialDesignCheckBox}" Margin="0 0 8 8" VerticalAlignment="Center">
235+
Check
236+
</CheckBox>
237+
<CheckBox Style="{StaticResource MaterialDesignCheckBox}" Margin="0 0 8 8" VerticalAlignment="Center" IsChecked="True">
238+
Mate
239+
</CheckBox>
240+
<CheckBox Style="{StaticResource MaterialDesignCheckBox}" Margin="0 0 8 8" VerticalAlignment="Center"
230241
IsEnabled="False">
231-
Disabled
232-
</CheckBox>
233-
</StackPanel>
234-
<StackPanel Grid.Row="7" Margin="0 16 0 0" Orientation="Horizontal">
235-
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center"
242+
Disabled
243+
</CheckBox>
244+
</StackPanel>
245+
<StackPanel Grid.Row="2" Margin="0 16 0 0" Orientation="Horizontal">
246+
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center"
236247
ToolTip="Default ToggleButton Style"/>
237-
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0" IsEnabled="False" />
238-
<ToggleButton Style="{StaticResource MaterialDesignSwitchLightToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0"
248+
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0" IsEnabled="False" />
249+
<ToggleButton Style="{StaticResource MaterialDesignSwitchLightToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0"
239250
ToolTip="MaterialDesignSwitchLightToggleButton" IsChecked="True" />
240-
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0"
251+
<ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0"
241252
ToolTip="MaterialDesignSwitchToggleButton" IsChecked="True" />
242-
<ToggleButton Style="{StaticResource MaterialDesignSwitchDarkToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0"
253+
<ToggleButton Style="{StaticResource MaterialDesignSwitchDarkToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0"
243254
ToolTip="MaterialDesignSwitchDarkToggleButton" IsChecked="True" />
244-
<ToggleButton Style="{StaticResource MaterialDesignSwitchAccentToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0"
255+
<ToggleButton Style="{StaticResource MaterialDesignSwitchAccentToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0"
245256
ToolTip="MaterialDesignSwitchAccentToggleButton" IsChecked="True" />
246-
</StackPanel>
247-
<StackPanel Grid.Row="8" Margin="0 16 0 0" Orientation="Horizontal">
248-
<ToggleButton Style="{StaticResource MaterialDesignFlatToggleButton}" ToolTip="MaterialDesignFlatToggleButton">
249-
<materialDesign:PackIcon Kind="Paperclip" Height="21" Width="21" />
250-
</ToggleButton>
251-
<ToggleButton Style="{StaticResource MaterialDesignFlatPrimaryToggleButton}"
257+
</StackPanel>
258+
<StackPanel Grid.Row="3" Margin="0 16 0 0" Orientation="Horizontal">
259+
<ToggleButton Style="{StaticResource MaterialDesignFlatToggleButton}" ToolTip="MaterialDesignFlatToggleButton">
260+
<materialDesign:PackIcon Kind="Paperclip" Height="21" Width="21" />
261+
</ToggleButton>
262+
<ToggleButton Style="{StaticResource MaterialDesignFlatPrimaryToggleButton}"
252263
Margin="8 0 0 0"
253264
ToolTip="MaterialDesignFlatPrimaryToggleButton"
254265
IsChecked="True">
255-
<materialDesign:PackIcon Kind="Heart" Height="21" Width="21" />
256-
</ToggleButton>
257-
<ToggleButton Style="{StaticResource MaterialDesignFlatPrimaryToggleButton}"
266+
<materialDesign:PackIcon Kind="Heart" Height="21" Width="21" />
267+
</ToggleButton>
268+
<ToggleButton Style="{StaticResource MaterialDesignFlatPrimaryToggleButton}"
258269
ToolTip="MaterialDesignFlatPrimaryToggleButton"
259270
IsEnabled="False" Margin="8 0 0 0">
260-
<materialDesign:PackIcon Kind="Heart" Height="21" Width="21" />
261-
</ToggleButton>
262-
</StackPanel>
263-
<TextBlock Margin="0 24 0 0" Grid.Row="9">Rating bar</TextBlock>
264-
<StackPanel Grid.Row="10" Margin="0 16 0 0" Orientation="Horizontal">
271+
<materialDesign:PackIcon Kind="Heart" Height="21" Width="21" />
272+
</ToggleButton>
273+
</StackPanel>
274+
275+
<ListBox Grid.Column="1" Grid.Row="0" Style="{StaticResource MaterialDesignToolToggleListBox}">
276+
<ListBox.ToolTip>
277+
<StackPanel>
278+
<TextBlock Text="MaterialDesignToolToggleListBox" />
279+
<TextBlock Text="Exclusive selection" />
280+
<TextBlock Text="ListBoxAssist.IsToggle allows more natural toggle behaviour" />
281+
</StackPanel>
282+
</ListBox.ToolTip>
283+
<ListBoxItem>
284+
<materialDesign:PackIcon Kind="FormatAlignLeft"/>
285+
</ListBoxItem>
286+
<ListBoxItem>
287+
<materialDesign:PackIcon Kind="FormatAlignCenter"/>
288+
</ListBoxItem>
289+
<ListBoxItem>
290+
<materialDesign:PackIcon Kind="FormatAlignRight"/>
291+
</ListBoxItem>
292+
<ListBoxItem>
293+
<materialDesign:PackIcon Kind="FormatAlignJustify"/>
294+
</ListBoxItem>
295+
</ListBox>
296+
297+
<ListBox Grid.Column="1" Grid.Row="1" Style="{StaticResource MaterialDesignToolToggleListBox}"
298+
SelectionMode="Extended"
299+
Margin="0 8 0 0">
300+
<ListBox.ToolTip>
301+
<StackPanel>
302+
<TextBlock Text="MaterialDesignToolToggleListBox" />
303+
<TextBlock Text="Multiple selection" />
304+
<TextBlock Text="ListBoxAssist.IsToggle allows more natural toggle behaviour" />
305+
</StackPanel>
306+
</ListBox.ToolTip>
307+
<ListBoxItem>
308+
<materialDesign:PackIcon Kind="FormatBold"/>
309+
</ListBoxItem>
310+
<ListBoxItem>
311+
<materialDesign:PackIcon Kind="FormatItalic"/>
312+
</ListBoxItem>
313+
<ListBoxItem x:Name="UnderlineCheckbox">
314+
<materialDesign:PackIcon Kind="FormatUnderline"/>
315+
</ListBoxItem>
316+
</ListBox>
317+
</Grid>
318+
319+
<Border Grid.Row="6" Margin="0 16 0 0" BorderThickness="0 1 0 0" BorderBrush="{DynamicResource MaterialDesignDivider}" />
320+
<TextBlock Margin="0 32 0 0" Grid.Row="6" Style="{StaticResource MaterialDesignHeadlineTextBlock}">Rating bar</TextBlock>
321+
<StackPanel Grid.Row="7" Margin="0 16 0 0" Orientation="Horizontal">
265322
<materialDesign:RatingBar Value="3" x:Name="BasicRatingBar" />
266323
<TextBlock Text="{Binding ElementName=BasicRatingBar, Path=Value, StringFormat=Rating: {0}}" VerticalAlignment="Top" Margin="10,2,0,0" />
267324
<materialDesign:RatingBar x:Name="CustomRatingBar" Max="3" Value="2" Margin="24 0 0 0" Orientation="Vertical">

‎MainDemo.Wpf/ProvingGround.xaml

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
x:Class="MaterialDesignColors.WpfExample.ProvingGround"
66
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
7+
xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
78
xmlns:wpfExample="clr-namespace:MaterialDesignColors.WpfExample"
89
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
910
Background="{DynamicResource MaterialDesignPaper}"
@@ -20,22 +21,46 @@
2021
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.DeepPurple.xaml" />
2122
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
2223
</ResourceDictionary.MergedDictionaries>
24+
25+
26+
27+
28+
2329
</ResourceDictionary>
2430
</UserControl.Resources>
2531

26-
<StackPanel>
27-
<materialDesign:ColorZone Mode="PrimaryDark" Padding="8">
28-
<StackPanel>
29-
<materialDesign:TimePicker SelectedTime="{Binding SelectedTime}" HorizontalAlignment="Left" />
30-
<DatePicker HorizontalAlignment="Left" materialDesign:HintAssist.Hint="Some date"/>
31-
<Calendar />
32-
</StackPanel>
33-
</materialDesign:ColorZone>
34-
<StackPanel>
35-
<materialDesign:TimePicker SelectedTime="{Binding SelectedTime}" HorizontalAlignment="Left" />
36-
<DatePicker HorizontalAlignment="Left" materialDesign:HintAssist.Hint="Some date"/>
37-
</StackPanel>
38-
32+
<StackPanel Margin="8">
33+
<ListBox Style="{StaticResource MaterialDesignToolToggleListBox}">
34+
<ListBoxItem>
35+
<materialDesign:PackIcon Kind="FormatAlignLeft"/>
36+
</ListBoxItem>
37+
<ListBoxItem>
38+
<materialDesign:PackIcon Kind="FormatAlignCenter"/>
39+
</ListBoxItem>
40+
<ListBoxItem>
41+
<materialDesign:PackIcon Kind="FormatAlignRight"/>
42+
</ListBoxItem>
43+
<ListBoxItem>
44+
<materialDesign:PackIcon Kind="FormatAlignJustify"/>
45+
</ListBoxItem>
46+
</ListBox>
47+
48+
<ListBox Style="{StaticResource MaterialDesignToolToggleListBox}"
49+
SelectionMode="Extended"
50+
Margin="0 8 0 0">
51+
<ListBoxItem>
52+
<materialDesign:PackIcon Kind="FormatBold"/>
53+
</ListBoxItem>
54+
<ListBoxItem>
55+
<materialDesign:PackIcon Kind="FormatItalic"/>
56+
</ListBoxItem>
57+
<ListBoxItem x:Name="UnderlineCheckbox">
58+
<materialDesign:PackIcon Kind="FormatUnderline"/>
59+
</ListBoxItem>
60+
</ListBox>
61+
62+
<CheckBox IsChecked="{Binding ElementName=UnderlineCheckbox, Path=IsSelected}">Underline?</CheckBox>
63+
3964
</StackPanel>
4065

4166
</UserControl>

‎MaterialDesignThemes.Wpf/Converters/BooleanToVisibilityConverter.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.Globalization;
4-
using System.Linq;
5-
using System.Text;
6-
using System.Threading.Tasks;
73
using System.Windows;
84
using System.Windows.Data;
95

0 commit comments

Comments
 (0)