Skip to content

Commit 65ddc48

Browse files
committed
disabled and error state for new TextBox styles
1 parent 532758c commit 65ddc48

File tree

4 files changed

+31
-7
lines changed

4 files changed

+31
-7
lines changed

MainDemo.Wpf/TextFields.xaml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<RowDefinition Height="Auto" />
6868
<RowDefinition Height="Auto" />
6969
<RowDefinition Height="Auto" />
70+
<RowDefinition Height="Auto" />
7071
</Grid.RowDefinitions>
7172
<TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Style="{StaticResource MaterialDesignHeadlineTextBlock}">Common Fields</TextBlock>
7273
<materialDesign:PackIcon Grid.Row="1" Grid.Column="0" Kind="Account" Foreground="{Binding ElementName=NameTextBox, Path=BorderBrush}" />
@@ -290,11 +291,17 @@
290291
<ComboBoxItem>Pear</ComboBoxItem>
291292
<ComboBoxItem>Orange</ComboBoxItem>
292293
</ComboBox>
293-
<TextBlock Grid.Row="13" Grid.Column="1" Grid.ColumnSpan="3" Style="{StaticResource MaterialDesignHeadlineTextBlock}" Margin="0,0,0,16">Text field box</TextBlock>
294-
<TextBox Grid.Row="14" Grid.Column="1" Grid.ColumnSpan="3" Style="{StaticResource MaterialDesignTextFieldBoxTextBox}"
295-
VerticalAlignment="Top" AcceptsReturn="True" TextWrapping="Wrap" MaxWidth="400" materialDesign:HintAssist.Hint="Floating hint in a box" />
296-
<TextBlock Grid.Row="13" Grid.Column="5" Grid.ColumnSpan="3" Style="{StaticResource MaterialDesignHeadlineTextBlock}" Margin="32,0,0,16">Text area box</TextBlock>
297-
<TextBox Grid.Row="14" Grid.Column="5" Grid.ColumnSpan="3" Style="{StaticResource MaterialDesignTextAreaTextBox}" Margin="32,0,0,0"
298-
VerticalAlignment="Top" Height="100" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" materialDesign:HintAssist.Hint="This is a text area" />
294+
<TextBlock Grid.Row="13" Grid.Column="1" Grid.ColumnSpan="3" Style="{StaticResource MaterialDesignHeadlineTextBlock}" Margin="0,32,0,16">Text field box</TextBlock>
295+
<CheckBox x:Name="MaterialDesignTextFieldBoxTextBoxEnabledComboBox" Grid.Row="14" Grid.Column="1" Grid.ColumnSpan="3"
296+
IsChecked="True" Margin="0,0,0,8">Enabled</CheckBox>
297+
<TextBox Grid.Row="15" Grid.Column="1" Grid.ColumnSpan="3" Style="{StaticResource MaterialDesignTextFieldBoxTextBox}"
298+
VerticalAlignment="Top" AcceptsReturn="True" TextWrapping="Wrap" MaxWidth="400" materialDesign:HintAssist.Hint="Floating hint in a box"
299+
IsEnabled="{Binding Path=IsChecked, ElementName=MaterialDesignTextFieldBoxTextBoxEnabledComboBox}" />
300+
<TextBlock Grid.Row="13" Grid.Column="5" Grid.ColumnSpan="3" Style="{StaticResource MaterialDesignHeadlineTextBlock}" Margin="32,32,0,16">Text area box</TextBlock>
301+
<CheckBox x:Name="MaterialDesignTextAreaTextBoxEnabledComboBox" Grid.Row="14" Grid.Column="5" Grid.ColumnSpan="3"
302+
IsChecked="True" Margin="32,0,0,8">Enabled</CheckBox>
303+
<TextBox Grid.Row="15" Grid.Column="5" Grid.ColumnSpan="3" Style="{StaticResource MaterialDesignTextAreaTextBox}" Margin="32,0,0,0"
304+
VerticalAlignment="Top" Height="100" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" materialDesign:HintAssist.Hint="This is a text area"
305+
IsEnabled="{Binding Path=IsChecked, ElementName=MaterialDesignTextAreaTextBoxEnabledComboBox}" />
299306
</Grid>
300307
</UserControl>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Dark.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,7 @@
3030
<SolidColorBrush x:Key="MaterialDesignSnackbarRipple" Color="#FF494949" po:Freeze="True" />
3131

3232
<SolidColorBrush x:Key="MaterialDesignTextFieldBoxBackground" Color="#1AFFFFFF" po:Freeze="True" /> <!-- 10% white -->
33+
<SolidColorBrush x:Key="MaterialDesignTextFieldBoxDisabledBackground" Color="#0DFFFFFF" po:Freeze="True" /> <!-- 5% white -->
34+
<SolidColorBrush x:Key="MaterialDesignTextAreaBorder" Color="#BCFFFFFF" po:Freeze="True" /> <!-- 74% white -->
35+
<SolidColorBrush x:Key="MaterialDesignTextAreaInactiveBorder" Color="#1AFFFFFF" po:Freeze="True" /> <!-- 10% white -->
3336
</ResourceDictionary>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Light.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,7 @@
3030
<SolidColorBrush x:Key="MaterialDesignSnackbarRipple" Color="#FFB6B6B6" po:Freeze="True" />
3131

3232
<SolidColorBrush x:Key="MaterialDesignTextFieldBoxBackground" Color="#0F000000" po:Freeze="True" /> <!-- 6% black -->
33+
<SolidColorBrush x:Key="MaterialDesignTextFieldBoxDisabledBackground" Color="#08000000" po:Freeze="True" /> <!-- 3% black -->
34+
<SolidColorBrush x:Key="MaterialDesignTextAreaBorder" Color="#BC000000" po:Freeze="True" /> <!-- 74% black -->
35+
<SolidColorBrush x:Key="MaterialDesignTextAreaInactiveBorder" Color="#0F000000" po:Freeze="True" /> <!-- 6% black -->
3336
</ResourceDictionary>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TextBox.xaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<Setter TargetName="textFieldBoxBorder" Property="Background" Value="Transparent" />
112112
<Setter TargetName="textFieldBoxBorder" Property="CornerRadius" Value="4" />
113113
<Setter TargetName="textFieldBoxBorder" Property="BorderThickness" Value="1" />
114-
<Setter TargetName="textFieldBoxBorder" Property="BorderBrush" Value="{DynamicResource MaterialDesignTextFieldBoxBackground}" />
114+
<Setter TargetName="textFieldBoxBorder" Property="BorderBrush" Value="{DynamicResource MaterialDesignTextAreaBorder}" />
115115
<Setter TargetName="textFieldBoxBorder" Property="Padding" Value="0,8,0,0" />
116116
<Setter TargetName="textFieldBoxBorder" Property="Margin" Value="-1" />
117117
<Setter TargetName="textFieldGrid" Property="Margin" Value="16,0,16,0" />
@@ -122,6 +122,8 @@
122122
</Trigger>
123123
<Trigger Property="IsEnabled" Value="false">
124124
<Setter Property="Opacity" TargetName="border" Value="0.56"/>
125+
<Setter TargetName="textFieldBoxBorder" Property="Background" Value="{DynamicResource MaterialDesignTextFieldBoxDisabledBackground}" />
126+
<Setter TargetName="textFieldBoxBorder" Property="BorderBrush" Value="{DynamicResource MaterialDesignTextAreaInactiveBorder}" />
125127
</Trigger>
126128
<Trigger Property="IsMouseOver" Value="true">
127129
<Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}"/>
@@ -150,6 +152,15 @@
150152
<Setter TargetName="textFieldBoxBorder" Property="BorderThickness" Value="2" />
151153
<Setter TargetName="textFieldBoxBorder" Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
152154
</MultiTrigger>
155+
<MultiTrigger>
156+
<MultiTrigger.Conditions>
157+
<Condition Property="Validation.HasError" Value="True" />
158+
<Condition Property="wpf:TextFieldAssist.HasTextAreaBox" Value="True" />
159+
</MultiTrigger.Conditions>
160+
<Setter TargetName="textFieldBoxBorder" Property="Margin" Value="-2" />
161+
<Setter TargetName="textFieldBoxBorder" Property="BorderThickness" Value="2" />
162+
<Setter TargetName="textFieldBoxBorder" Property="BorderBrush" Value="{DynamicResource ValidationErrorBrush}" />
163+
</MultiTrigger>
153164
</ControlTemplate.Triggers>
154165
</ControlTemplate>
155166
</Setter.Value>

0 commit comments

Comments
 (0)