Skip to content

Commit 3f152b0

Browse files
JeffBarnardKeboo
authored andcommitted
Disabled TextBox BorderThickness bugfix, fixes #893 (#912)
Thank you. Great work. Sorry it took so long to get it merged.
1 parent 279c022 commit 3f152b0

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@
488488
</Grid>
489489
<Line x:Name="DashedLine" Grid.ColumnSpan="2" Grid.Column="0" VerticalAlignment="Bottom"
490490
Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Converter={StaticResource InverseBoolToVisConverter}}"
491-
StrokeThickness="1.25" StrokeDashArray="1,2.5" StrokeDashCap="Round"
491+
StrokeThickness="{Binding BorderThickness.Bottom, ElementName=toggleButton, Converter={StaticResource DivisionMathConverter}, ConverterParameter=0.75}" StrokeDashArray="1,2.5" StrokeDashCap="Round"
492492
X1="0" X2="{Binding ActualWidth, ElementName=toggleButton}" Y1="0" Y2="0"
493493
Stroke="{TemplateBinding BorderBrush}" Opacity="0.56" />
494494
<wpf:Underline x:Name="Underline"

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
</ResourceDictionary.MergedDictionaries>
99

1010
<converters:BooleanToVisibilityConverter x:Key="InverseBoolToVisConverter" TrueValue="Collapsed" FalseValue="Visible"/>
11+
<converters:MathConverter Operation="Divide" x:Key="DivisionMathConverter" />
1112
<converters:TextFieldClearButtonVisibilityConverter x:Key="ClearTextConverter" />
1213
<converters:NotConverter x:Key="NotConverter" />
1314

@@ -144,7 +145,8 @@
144145
VerticalAlignment="Bottom"
145146
SnapsToDevicePixels="True" />
146147
<Line x:Name="DashedLine" VerticalAlignment="Bottom" Visibility="Hidden"
147-
StrokeThickness="1.25" StrokeDashArray="1,2.5" StrokeDashCap="Round"
148+
StrokeThickness="{Binding BorderThickness.Bottom, ElementName=border, Converter={StaticResource DivisionMathConverter}, ConverterParameter=0.75}"
149+
StrokeDashArray="1,2.5" StrokeDashCap="Round"
148150
X1="0" X2="{Binding ActualWidth, ElementName=border}" Y1="0" Y2="0"
149151
Stroke="{TemplateBinding BorderBrush}" Opacity="0.56" />
150152
<wpf:Underline x:Name="Underline" Visibility="{Binding Path=(wpf:TextFieldAssist.DecorationVisibility), RelativeSource={RelativeSource TemplatedParent}}"

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
</ResourceDictionary.MergedDictionaries>
99

1010
<converters:TextFieldHintVisibilityConverter x:Key="TextFieldHintVisibilityConverter" />
11+
<converters:MathConverter Operation="Divide" x:Key="DivisionMathConverter" />
1112
<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
1213
<converters:TextFieldClearButtonVisibilityConverter x:Key="ClearTextConverter" />
1314
<converters:NotConverter x:Key="NotConverter" />
@@ -153,7 +154,8 @@
153154
SnapsToDevicePixels="True" />
154155
<Line x:Name="DashedLine" VerticalAlignment="Bottom" Visibility="Collapsed"
155156
X1="0" X2="{Binding ActualWidth, ElementName=border}" Y1="0" Y2="0"
156-
StrokeThickness="1.25" StrokeDashArray="1,2.5" StrokeDashCap="Round"
157+
StrokeThickness="{Binding BorderThickness.Bottom, ElementName=border, Converter={StaticResource DivisionMathConverter}, ConverterParameter=0.75}"
158+
StrokeDashArray="1,2.5" StrokeDashCap="Round"
157159
Stroke="{TemplateBinding BorderBrush}" Opacity="0.56" />
158160
<wpf:Underline x:Name="Underline" Visibility="{Binding Path=(wpf:TextFieldAssist.DecorationVisibility), RelativeSource={RelativeSource TemplatedParent}}"
159161
CornerRadius="{Binding Path=(wpf:TextFieldAssist.UnderlineCornerRadius), RelativeSource={RelativeSource TemplatedParent}}"

0 commit comments

Comments
 (0)