Skip to content

Commit 1d57d80

Browse files
JeffBarnardJeffBarnard
committed
merge
2 parents 2c33d51 + 5912e62 commit 1d57d80

File tree

7 files changed

+68
-29
lines changed

7 files changed

+68
-29
lines changed

‎MainDemo.Wpf/TextFields.xaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,9 @@
6969
Height="80">Multiline. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. The quick brown fox jumps over the lazy dog. War and peace. Keep going. Go on. For how long? Not long. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</TextBox>
7070
<StackPanel Orientation="Horizontal">
7171
<materialDesign:PackIcon Kind="Phone" Margin="0 0 8 0" Foreground="{Binding ElementName=PhoneTextBox, Path=BorderBrush}" />
72-
<TextBox
73-
x:Name="PhoneTextBox"
74-
materialDesign:TransitionAssist.DisableTransitions="True"
75-
Width="150"
76-
/>
72+
<TextBox x:Name="PhoneTextBox"
73+
materialDesign:TransitionAssist.DisableTransitions="True"
74+
Width="150" />
7775
</StackPanel>
7876
<StackPanel Orientation="Horizontal">
7977
<TextBlock VerticalAlignment="Center" Margin="0 0 8 0" >Fruit</TextBlock>
@@ -85,24 +83,26 @@
8583
<ComboBoxItem>Orange</ComboBoxItem>
8684
</ComboBox>
8785
</StackPanel>
88-
<TextBox
89-
x:Name="CommentTextBox"
90-
materialDesign:HintAssist.Hint="Comment"
91-
/>
86+
<TextBox x:Name="CommentTextBox"
87+
materialDesign:HintAssist.Hint="Comment" />
9288
<StackPanel Orientation="Horizontal">
9389
<materialDesign:PackIcon Margin="0 0 8 0" Kind="Key" Foreground="{Binding ElementName=PasswordBox, Path=BorderBrush}" HorizontalAlignment="Right" />
94-
<PasswordBox
95-
x:Name="PasswordBox"
96-
materialDesign:HintAssist.Hint="Password" />
90+
<PasswordBox x:Name="PasswordBox"
91+
materialDesign:HintAssist.Hint="Password" />
9792
</StackPanel>
98-
<TextBox materialDesign:HintAssist.Hint="Floating Hint"
93+
<TextBox materialDesign:HintAssist.Hint="Floating Hint"
9994
Style="{StaticResource MaterialDesignFloatingHintTextBox}" />
10095
<ComboBox materialDesign:HintAssist.Hint="OS" Style="{StaticResource MaterialDesignFloatingHintComboBox}">
10196
<ComboBoxItem>Android</ComboBoxItem>
10297
<ComboBoxItem>iOS</ComboBoxItem>
10398
<ComboBoxItem>Linux</ComboBoxItem>
10499
<ComboBoxItem>Windows</ComboBoxItem>
105100
</ComboBox>
101+
<StackPanel>
102+
<TextBox materialDesign:HintAssist.Hint="I'm Disabled" IsEnabled="False" Margin="0 8 0 0" />
103+
<ComboBox materialDesign:HintAssist.Hint="Disabled Combo" IsEnabled="False" Margin="0 8 0 0" />
104+
<PasswordBox Password="01234" IsEnabled="False" Margin="0 8 0 0" />
105+
</StackPanel>
106106
<ComboBox materialDesign:HintAssist.Hint="Virtualisation"
107107
MinWidth="72"
108108

‎MaterialDesignThemes.Wpf/ListBoxAssist.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ private static void ListBoxMouseButtonEvent(object sender, MouseButtonEventArgs
2727
var point = mouseButtonEventArgs.GetPosition(senderElement);
2828
var result = VisualTreeHelper.HitTest(senderElement, point);
2929

30+
if (result == null) return;
31+
3032
ListBoxItem listBoxItem = null;
3133
Ripple ripple = null;
3234
foreach (var dependencyObject in result.VisualHit.GetVisualAncestry().TakeWhile(_ => listBoxItem == null))

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
<converters:TextFieldHintVisibilityConverter x:Key="TextFieldHintVisibilityConverter" IsNotEmptyValue="Collapsed" />
1414
<converters:MathConverter x:Key="MathAddConverter" Operation="Add" />
1515
<converters:BrushRoundConverter x:Key="BrushRoundConverter" />
16-
16+
<converters:BooleanToVisibilityConverter x:Key="InverseBoolToVisConverter" TrueValue="Collapsed" FalseValue="Visible"/>
17+
1718
<system:Double x:Key="PopupContentPresenterExtend">4</system:Double>
1819
<system:Double x:Key="PopupTopBottomMargin">8</system:Double>
1920
<system:Double x:Key="PopupLeftRightMargin">16</system:Double>
@@ -377,14 +378,14 @@
377378
<Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false" />
378379
<Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false" />
379380
</MultiDataTrigger.Conditions>
380-
<Setter TargetName="ToggleTemplateRoot" Property="BorderBrush" Value="{DynamicResource MaterialDesignCheckBoxDisabled}" />
381+
<Setter TargetName="ToggleTemplateRoot" Property="BorderBrush" Value="Transparent"/>
381382
</MultiDataTrigger>
382383
<MultiDataTrigger>
383384
<MultiDataTrigger.Conditions>
384385
<Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false" />
385386
<Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true" />
386387
</MultiDataTrigger.Conditions>
387-
<Setter TargetName="ToggleTemplateRoot" Property="BorderBrush" Value="{DynamicResource MaterialDesignCheckBoxDisabled}" />
388+
<Setter TargetName="ToggleTemplateRoot" Property="BorderBrush" Value="Transparent"/>
388389
<Setter TargetName="splitBorder" Property="BorderBrush" Value="{DynamicResource MaterialDesignCheckBoxDisabled}" />
389390
</MultiDataTrigger>
390391
</ControlTemplate.Triggers>
@@ -440,6 +441,11 @@
440441
Hint="{TemplateBinding wpf:HintAssist.Hint}" />
441442
</Grid>
442443
</Grid>
444+
<Line x:Name="DashedLine" Grid.ColumnSpan="2" VerticalAlignment="Bottom"
445+
Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Converter={StaticResource InverseBoolToVisConverter}}"
446+
StrokeThickness="1.25" StrokeDashArray="1,2.5" StrokeDashCap="Round"
447+
X1="0" X2="{Binding ActualWidth, ElementName=toggleButton}" Y1="0" Y2="0"
448+
Stroke="{TemplateBinding BorderBrush}" Opacity="0.56" />
443449
<wpf:Underline x:Name="Underline"
444450
Grid.ColumnSpan="2"
445451
IsActive="{Binding ElementName=PART_EditableTextBox, Path=IsKeyboardFocused}"
@@ -481,6 +487,7 @@
481487
</Trigger>
482488
<Trigger Property="IsEnabled" Value="False">
483489
<Setter TargetName="templateRoot" Property="Opacity" Value="0.56"/>
490+
<Setter TargetName="toggleButton" Property="BorderBrush" Value="Transparent"/>
484491
</Trigger>
485492
<Trigger Property="IsEditable" Value="True">
486493
<Setter TargetName="PART_EditableTextBox" Property="Visibility" Value="Visible" />
@@ -610,4 +617,4 @@
610617
<Setter Property="wpf:HintAssist.IsFloating" Value="True"/>
611618
</Style>
612619

613-
</ResourceDictionary>
620+
</ResourceDictionary>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
</ResourceDictionary.MergedDictionaries>
1111

1212
<Style x:Key="{x:Static GridView.GridViewScrollViewerStyleKey}" TargetType="{x:Type ScrollViewer}">
13+
<Setter Property="CanContentScroll" Value="True" />
1314
<Setter Property="Template">
1415
<Setter.Value>
1516
<ControlTemplate TargetType="{x:Type ScrollViewer}">
@@ -227,7 +228,6 @@
227228
<Setter Property="BorderThickness" Value="0" />
228229
<Setter Property="FontSize" Value="13" />
229230
<Setter Property="ItemContainerStyle" Value="{Binding RelativeSource={RelativeSource Self}, Path=View, Converter={StaticResource MaterialDesignListViewItemContainerStyleConverter}}" />
230-
<Setter Property="ScrollViewer.CanContentScroll" Value="True" />
231231
<Setter Property="ScrollViewer.PanningMode" Value="Both" />
232232
<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
233233
<Setter Property="SnapsToDevicePixels" Value="True" />

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
<ResourceDictionary Source="MaterialDesignTheme.ValidationErrorTemplate.xaml" />
88
</ResourceDictionary.MergedDictionaries>
99

10+
<converters:BooleanToVisibilityConverter x:Key="InverseBoolToVisConverter" TrueValue="Collapsed" FalseValue="Visible"/>
11+
1012
<Style x:Key="MaterialDesignPasswordBox" TargetType="{x:Type PasswordBox}">
1113
<Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}"/>
1214
<Setter Property="FontFamily" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.FontFamily)}"/>
@@ -54,6 +56,10 @@
5456
/>
5557
</Grid>
5658
</Border>
59+
<Line x:Name="DashedLine" VerticalAlignment="Bottom" Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Converter={StaticResource InverseBoolToVisConverter}}"
60+
StrokeThickness="1.25" StrokeDashArray="1,2.5" StrokeDashCap="Round"
61+
X1="0" X2="{Binding ActualWidth, ElementName=border}" Y1="0" Y2="0"
62+
Stroke="{TemplateBinding BorderBrush}" Opacity="0.56" />
5763
<wpf:Underline x:Name="Underline" Visibility="{Binding Path=(wpf:TextFieldAssist.DecorationVisibility), RelativeSource={RelativeSource TemplatedParent}}"/>
5864
</Grid>
5965
<ControlTemplate.Triggers>
@@ -69,7 +75,8 @@
6975
<Setter TargetName="border" Property="Padding" Value="0 15.5 0 4" />
7076
</Trigger>
7177
<Trigger Property="IsEnabled" Value="false">
72-
<Setter Property="Opacity" TargetName="border" Value="0.56"/>
78+
<Setter Property="Opacity" TargetName="border" Value="0.42"/>
79+
<Setter TargetName="border" Property="BorderBrush" Value="Transparent" />
7380
</Trigger>
7481
<Trigger Property="IsMouseOver" Value="true">
7582
<Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}"/>

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

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ResourceDictionary.MergedDictionaries>
77
<ResourceDictionary Source="MaterialDesignTheme.ValidationErrorTemplate.xaml" />
88
</ResourceDictionary.MergedDictionaries>
9-
9+
1010
<converters:TextFieldHintVisibilityConverter x:Key="TextFieldHintVisibilityConverter" />
1111

1212
<Style x:Key="MaterialDesignTextBox" TargetType="{x:Type TextBox}">
@@ -80,6 +80,10 @@
8080
/>
8181
</Grid>
8282
</Border>
83+
<Line x:Name="DashedLine" VerticalAlignment="Bottom" Visibility="Hidden"
84+
StrokeThickness="1.25" StrokeDashArray="1,2.5" StrokeDashCap="Round"
85+
X1="0" X2="{Binding ActualWidth, ElementName=border}" Y1="0" Y2="0"
86+
Stroke="{TemplateBinding BorderBrush}" Opacity="0.56" />
8387
<wpf:Underline x:Name="Underline" Visibility="{Binding Path=(wpf:TextFieldAssist.DecorationVisibility), RelativeSource={RelativeSource TemplatedParent}}"/>
8488
</Grid>
8589
</Border>
@@ -120,11 +124,30 @@
120124
<Setter TargetName="Hint" Property="Margin" Value="0,0,0,16" />
121125
<Setter TargetName="PART_ContentHost" Property="Margin" Value="0,8,0,8" />
122126
</Trigger>
123-
<Trigger Property="IsEnabled" Value="false">
124-
<Setter Property="Opacity" TargetName="border" Value="0.56"/>
127+
<MultiTrigger>
128+
<MultiTrigger.Conditions>
129+
<Condition Property="IsEnabled" Value="false" />
130+
<Condition Property="wpf:TextFieldAssist.HasTextAreaBox" Value="True" />
131+
</MultiTrigger.Conditions>
125132
<Setter TargetName="textFieldBoxBorder" Property="Background" Value="{DynamicResource MaterialDesignTextFieldBoxDisabledBackground}" />
126133
<Setter TargetName="textFieldBoxBorder" Property="BorderBrush" Value="{DynamicResource MaterialDesignTextAreaInactiveBorder}" />
127-
</Trigger>
134+
</MultiTrigger>
135+
<MultiTrigger>
136+
<MultiTrigger.Conditions>
137+
<Condition Property="IsEnabled" Value="false" />
138+
<Condition Property="wpf:TextFieldAssist.HasTextAreaBox" Value="False" />
139+
</MultiTrigger.Conditions>
140+
<Setter Property="Opacity" TargetName="border" Value="0.42"/>
141+
<Setter TargetName="border" Property="BorderBrush" Value="Transparent" />
142+
</MultiTrigger>
143+
<MultiTrigger>
144+
<MultiTrigger.Conditions>
145+
<Condition Property="IsEnabled" Value="false" />
146+
<Condition Property="wpf:TextFieldAssist.HasTextAreaBox" Value="False" />
147+
<Condition Property="wpf:TextFieldAssist.HasTextFieldBox" Value="False" />
148+
</MultiTrigger.Conditions>
149+
<Setter TargetName="DashedLine" Property="Visibility" Value="Visible" />
150+
</MultiTrigger>
128151
<Trigger Property="IsMouseOver" Value="true">
129152
<Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}"/>
130153
</Trigger>
@@ -188,4 +211,4 @@
188211
<Setter Property="wpf:TextFieldAssist.HasTextAreaBox" Value="True" />
189212
</Style>
190213

191-
</ResourceDictionary>
214+
</ResourceDictionary>

‎appveyor.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
assembly_info:
1010
patch: true
1111
file: '**\AssemblyInfo.*'
12-
assembly_version: '2.3.1.{build}'
13-
assembly_file_version: '2.3.1.{build}'
14-
assembly_informational_version: '2.3.1.{build}'
12+
assembly_version: '2.3.2.{build}'
13+
assembly_file_version: '2.3.2.{build}'
14+
assembly_informational_version: '2.3.2.{build}'
1515
environment:
1616
RestorePackages: false
1717
before_build:
@@ -25,7 +25,7 @@
2525
- path: '**\MaterialDesignThemes.*.nupkg'
2626
- path: bin\**\*.*
2727

28-
version: 2.3.1-ci{build}
28+
version: 2.3.2-ci{build}
2929
deploy:
3030
- provider: NuGet
3131
api_key:
@@ -58,4 +58,4 @@
5858
- path: '**\MaterialDesignThemes.*.nupkg'
5959
- path: bin\**\*.*
6060

61-
version: 2.3.1.{build}
61+
version: 2.3.2.{build}

0 commit comments

Comments
 (0)