Skip to content

Commit 8cd6cb5

Browse files
ButchersBoyButchersBoy
committed
Merge branch 'master' into release
2 parents 13037bc + bf669f5 commit 8cd6cb5

27 files changed

+660
-182
lines changed

‎CONTRIBUTING.md renamed to ‎.github/CONTRIBUTING.md

File renamed without changes.

‎.github/ISSUE_TEMPLATE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# This is a place for issues. Questions are better asked in the Gitter chat room.
2+
3+
# Seriously consider creating and linking to a test repo which takes absolutely minimal setup to illustrate how reproduce the problem.

‎MainDemo.Wpf/Buttons.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@
119119
<CheckBox Grid.Column="1" Grid.Row="2" IsChecked="True" VerticalAlignment="Bottom" />
120120
<CheckBox Grid.Column="1" Grid.Row="3" VerticalAlignment="Bottom" />
121121
<ComboBox Grid.Column="0" Grid.Row="4" materialDesign:HintAssist.Hint="Setting 4" materialDesign:HintAssist.IsFloating="True"
122+
MaxDropDownHeight="200"
122123
Margin="8 8 8 8">
123124
<ComboBoxItem>25%</ComboBoxItem>
124125
<ComboBoxItem>50%</ComboBoxItem>
@@ -127,7 +128,7 @@
127128
<ComboBoxItem>150%</ComboBoxItem>
128129
<ComboBoxItem>200%</ComboBoxItem>
129130
<ComboBoxItem>250%</ComboBoxItem>
130-
<ComboBoxItem>500%</ComboBoxItem>
131+
<ComboBoxItem>501%</ComboBoxItem>
131132
</ComboBox>
132133
</Grid>
133134

‎MainDemo.Wpf/Domain/TextFieldsViewModel.cs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ namespace MaterialDesignColors.WpfExample.Domain
1313
public class TextFieldsViewModel : INotifyPropertyChanged
1414
{
1515
private string _name;
16-
private int _selectedValueOne;
16+
private int? _selectedValueOne;
17+
private string _selectedTextTwo;
1718

1819
public TextFieldsViewModel()
1920
{
2021
LongListToTestComboVirtualization = new List<int>(Enumerable.Range(0, 1000));
2122

2223
SelectedValueOne = LongListToTestComboVirtualization.Skip(2).First();
24+
SelectedTextTwo = null;
2325
}
2426

2527
public string Name
@@ -31,13 +33,22 @@ public string Name
3133
}
3234
}
3335

34-
public int SelectedValueOne
36+
public int? SelectedValueOne
3537
{
3638
get { return _selectedValueOne; }
3739
set
3840
{
3941
this.MutateVerbose(ref _selectedValueOne, value, RaisePropertyChanged());
4042
}
43+
}
44+
45+
public string SelectedTextTwo
46+
{
47+
get { return _selectedTextTwo; }
48+
set
49+
{
50+
this.MutateVerbose(ref _selectedTextTwo, value, RaisePropertyChanged());
51+
}
4152
}
4253

4354
public IList<int> LongListToTestComboVirtualization { get; }

‎MainDemo.Wpf/Expander.xaml

Lines changed: 121 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,139 @@
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"
5-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:local="clr-namespace:MaterialDesignColors.WpfExample"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
77
mc:Ignorable="d"
88
d:DesignHeight="400" d:DesignWidth="600">
99
<Grid>
10+
<Grid.RowDefinitions>
11+
<RowDefinition Height="Auto" />
12+
<RowDefinition Height="Auto" />
13+
</Grid.RowDefinitions>
1014
<Grid.ColumnDefinitions>
11-
<ColumnDefinition Width="50*" />
12-
<ColumnDefinition Width="50*" />
15+
<ColumnDefinition Width="1*" />
16+
<ColumnDefinition Width="1*" />
1317
</Grid.ColumnDefinitions>
14-
<StackPanel HorizontalAlignment="Stretch" Margin="8" Orientation="Vertical" VerticalAlignment="Stretch">
15-
<Expander IsExpanded="True" HorizontalAlignment="Stretch">
16-
<Expander.Header>
17-
<TextBlock Text="Expander Example 1" />
18-
</Expander.Header>
19-
<Border Background="{DynamicResource MaterialDesignBody}"
20-
CornerRadius="5" Padding="5">
18+
<StackPanel>
19+
<Expander HorizontalAlignment="Stretch"
20+
Header="Expander Example 1a">
21+
<StackPanel Orientation="Vertical"
22+
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
23+
Margin="16">
24+
<TextBlock Text="Your Content" />
25+
<TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
26+
TextWrapping="Wrap"/>
27+
</StackPanel>
28+
</Expander>
29+
<Expander HorizontalAlignment="Stretch"
30+
Header="Expander Example 1b">
31+
<StackPanel Orientation="Vertical"
32+
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
33+
Margin="16">
34+
<TextBlock Text="Your Content" />
35+
<TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
36+
TextWrapping="Wrap"/>
37+
</StackPanel>
38+
</Expander>
39+
<Expander HorizontalAlignment="Stretch"
40+
Header="Expander Example 1c">
41+
<StackPanel Orientation="Vertical"
42+
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
43+
Margin="16">
44+
<TextBlock Text="Your Content" />
45+
<TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
46+
TextWrapping="Wrap"/>
47+
</StackPanel>
48+
</Expander>
49+
</StackPanel>
50+
<materialDesign:Card Grid.Row="1" Background="{DynamicResource MaterialDesignBackground}"
51+
Margin="0 24 0 0">
52+
<StackPanel>
53+
<Expander HorizontalAlignment="Stretch"
54+
Header="Expander Example 2a">
55+
<StackPanel Orientation="Vertical"
56+
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
57+
Margin="16">
58+
<TextBlock Text="Your Content" />
59+
<TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
60+
TextWrapping="Wrap"/>
61+
</StackPanel>
62+
</Expander>
63+
<Expander HorizontalAlignment="Stretch"
64+
Header="Expander Example 2b">
2165
<StackPanel Orientation="Vertical"
22-
TextBlock.Foreground="{DynamicResource MaterialDesignPaper}">
23-
<TextBlock Text="A short text to proof functionality." />
24-
<TextBlock Margin="0,50,0,0" Text="A short text to proof functionality." />
66+
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
67+
Margin="16">
68+
<TextBlock Text="Your Content" />
69+
<TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
70+
TextWrapping="Wrap"/>
2571
</StackPanel>
26-
</Border>
72+
</Expander>
73+
<Expander HorizontalAlignment="Stretch"
74+
Header="Expander Example 2c">
75+
<StackPanel Orientation="Vertical"
76+
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
77+
Margin="16">
78+
<TextBlock Text="Your Content" />
79+
<TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
80+
TextWrapping="Wrap"/>
81+
</StackPanel>
82+
</Expander>
83+
</StackPanel>
84+
</materialDesign:Card>
85+
<StackPanel Grid.Column="1" HorizontalAlignment="Left" Margin="8" Orientation="Horizontal" VerticalAlignment="Stretch"
86+
Grid.RowSpan="2">
87+
<Expander ExpandDirection="Right">
88+
<Expander.Header>
89+
<TextBlock Text="Expander Example 3a" RenderTransformOrigin=".5,.5">
90+
<TextBlock.LayoutTransform>
91+
<RotateTransform Angle="90" />
92+
</TextBlock.LayoutTransform>
93+
</TextBlock>
94+
</Expander.Header>
95+
<StackPanel Orientation="Vertical"
96+
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
97+
Margin="16">
98+
<TextBlock Text="Your Content" />
99+
<TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
100+
MaxWidth="180"
101+
TextWrapping="Wrap"/>
102+
</StackPanel>
27103
</Expander>
28-
<TextBlock Text="Text after the expander." Margin="0,8,0,0" />
29-
</StackPanel>
30-
<StackPanel Grid.Column="1" HorizontalAlignment="Stretch" Margin="8" Orientation="Vertical" VerticalAlignment="Stretch">
31-
<Expander IsExpanded="False" HorizontalAlignment="Stretch">
104+
<Expander ExpandDirection="Right">
105+
<Expander.Header>
106+
<TextBlock Text="Expander Example 3b" RenderTransformOrigin=".5,.5">
107+
<TextBlock.LayoutTransform>
108+
<RotateTransform Angle="90" />
109+
</TextBlock.LayoutTransform>
110+
</TextBlock>
111+
</Expander.Header>
112+
<StackPanel Orientation="Vertical"
113+
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
114+
Margin="16">
115+
<TextBlock Text="Your Content" />
116+
<TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
117+
MaxWidth="180"
118+
TextWrapping="Wrap"/>
119+
</StackPanel>
120+
</Expander>
121+
<Expander ExpandDirection="Right">
32122
<Expander.Header>
33-
<TextBlock Text="Expander Example 2" />
123+
<TextBlock Text="Expander Example 3c" RenderTransformOrigin=".5,.5">
124+
<TextBlock.LayoutTransform>
125+
<RotateTransform Angle="90" />
126+
</TextBlock.LayoutTransform>
127+
</TextBlock>
34128
</Expander.Header>
35-
<StackPanel Orientation="Vertical" Margin="8">
36-
<TextBlock Text="A short text to proof functionality." />
37-
<TextBlock Margin="0,150,0,0" Text="A short text to proof functionality." />
129+
<StackPanel Orientation="Vertical"
130+
TextBlock.Foreground="{DynamicResource MaterialDesignBody}"
131+
Margin="16">
132+
<TextBlock Text="Your Content" />
133+
<TextBlock Opacity=".68" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
134+
MaxWidth="180"
135+
TextWrapping="Wrap"/>
38136
</StackPanel>
39137
</Expander>
40-
<TextBlock Text="Text after the expander." Margin="0,8,0,0" />
41138
</StackPanel>
42139
</Grid>
43140
</UserControl>

‎MainDemo.Wpf/MainWindow.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,9 @@
195195
<materialDesign:PopupBox DockPanel.Dock="Right" PlacementMode="BottomAndAlignRightEdges" StaysOpen="False">
196196
<StackPanel>
197197
<Button Content="Hello World" Click="MenuPopupButton_OnClick"/>
198+
<Separator/>
198199
<Button Content="Nice Popup" Click="MenuPopupButton_OnClick"/>
200+
<Separator/>
199201
<Button Content="Goodbye" Click="MenuPopupButton_OnClick"/>
200202
</StackPanel>
201203
</materialDesign:PopupBox>

‎MainDemo.Wpf/MainWindow.xaml.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Windows.Controls;
33
using System.Windows.Controls.Primitives;
44
using System.Windows.Input;
5+
using System.Windows.Media;
56
using MaterialDesignColors.WpfExample.Domain;
67
using MaterialDesignThemes.Wpf;
78

@@ -19,6 +20,14 @@ public MainWindow()
1920

2021
private void UIElement_OnPreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
2122
{
23+
//until we had a StaysOpen glag to Drawer, this will help with scroll bars
24+
var dependencyObject = Mouse.Captured as DependencyObject;
25+
while (dependencyObject != null)
26+
{
27+
if (dependencyObject is ScrollBar) return;
28+
dependencyObject = VisualTreeHelper.GetParent(dependencyObject);
29+
}
30+
2231
MenuToggleButton.IsChecked = false;
2332
}
2433

‎MainDemo.Wpf/ProvingGround.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
</ListBox>
6161

6262
<CheckBox IsChecked="{Binding ElementName=UnderlineCheckbox, Path=IsSelected}">Underline?</CheckBox>
63+
64+
<materialDesign:TimePicker Margin="0 16 0 0" SelectedTime="{Binding SelectedTime}" HorizontalAlignment="Left" />
6365

6466
</StackPanel>
6567

‎MainDemo.Wpf/ProvingGround.xaml.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ public partial class ProvingGround : UserControl
2828
public ProvingGround()
2929
{
3030
InitializeComponent();
31-
DataContext = new ProvingGroundViewModel();
31+
DataContext = new ProvingGroundViewModel
32+
{
33+
SelectedTime = new DateTime(2000, 1, 1, 3, 15, 0)
34+
};
3235
}
3336

3437
private void Button_Click(object sender, RoutedEventArgs e)

0 commit comments

Comments
 (0)