|
15 | 15 | <Setter Property="BorderThickness" Value="0 0 0 1"/>
|
16 | 16 | <Setter Property="wpf:TextFieldAssist.TextBoxViewMargin" Value="0 0 0 0" />
|
17 | 17 | <Setter Property="Background" Value="Transparent"/>
|
18 |
| - <Setter Property="CaretBrush" Value="{Binding RelativeSource={RelativeSource Self}, Path=BorderBrush}"/> |
| 18 | + <Setter Property="CaretBrush" Value="{DynamicResource PrimaryHueMidBrush}"/> |
19 | 19 | <Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
|
20 | 20 | <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
|
21 | 21 | <Setter Property="VerticalContentAlignment" Value="Bottom"/>
|
|
96 | 96 | <Setter TargetName="border" Property="Margin" Value="0 12 0 0" />
|
97 | 97 | </Trigger>
|
98 | 98 | <Trigger Property="wpf:TextFieldAssist.HasTextFieldBox" Value="True">
|
| 99 | + <Setter Property="VerticalContentAlignment" Value="Top" /> |
99 | 100 | <Setter TargetName="textFieldBoxBorder" Property="Background" Value="{DynamicResource MaterialDesignTextFieldBoxBackground}" />
|
100 | 101 | <Setter TargetName="textFieldBoxBorder" Property="CornerRadius" Value="4" />
|
101 | 102 | <Setter TargetName="textFieldBoxBorder" Property="Padding" Value="0,8,0,0" />
|
|
105 | 106 | <Setter TargetName="Hint" Property="Margin" Value="0,0,0,16" />
|
106 | 107 | <Setter TargetName="PART_ContentHost" Property="Margin" Value="0,8,0,8" />
|
107 | 108 | </Trigger>
|
| 109 | + <Trigger Property="wpf:TextFieldAssist.HasTextAreaBox" Value="True"> |
| 110 | + <Setter Property="VerticalContentAlignment" Value="Top" /> |
| 111 | + <Setter TargetName="textFieldBoxBorder" Property="Background" Value="Transparent" /> |
| 112 | + <Setter TargetName="textFieldBoxBorder" Property="CornerRadius" Value="4" /> |
| 113 | + <Setter TargetName="textFieldBoxBorder" Property="BorderThickness" Value="1" /> |
| 114 | + <Setter TargetName="textFieldBoxBorder" Property="BorderBrush" Value="{DynamicResource MaterialDesignTextFieldBoxBackground}" /> |
| 115 | + <Setter TargetName="textFieldBoxBorder" Property="Padding" Value="0,8,0,0" /> |
| 116 | + <Setter TargetName="textFieldBoxBorder" Property="Margin" Value="-1" /> |
| 117 | + <Setter TargetName="textFieldGrid" Property="Margin" Value="16,0,16,0" /> |
| 118 | + <Setter TargetName="border" Property="BorderThickness" Value="0" /> |
| 119 | + <Setter TargetName="Underline" Property="Visibility" Value="Collapsed" /> |
| 120 | + <Setter TargetName="Hint" Property="Margin" Value="0,0,0,16" /> |
| 121 | + <Setter TargetName="PART_ContentHost" Property="Margin" Value="0,8,0,8" /> |
| 122 | + </Trigger> |
108 | 123 | <Trigger Property="IsEnabled" Value="false">
|
109 | 124 | <Setter Property="Opacity" TargetName="border" Value="0.56"/>
|
110 | 125 | </Trigger>
|
|
118 | 133 | <Setter Property="BorderBrush" Value="{DynamicResource ValidationErrorBrush}"/>
|
119 | 134 | <Setter TargetName="Underline" Property="Background" Value="{DynamicResource ValidationErrorBrush}"/>
|
120 | 135 | </Trigger>
|
| 136 | + <MultiTrigger> |
| 137 | + <MultiTrigger.Conditions> |
| 138 | + <Condition Property="IsMouseOver" Value="True" /> |
| 139 | + <Condition Property="wpf:TextFieldAssist.HasTextAreaBox" Value="True" /> |
| 140 | + </MultiTrigger.Conditions> |
| 141 | + <Setter TargetName="textFieldBoxBorder" Property="Margin" Value="-2" /> |
| 142 | + <Setter TargetName="textFieldBoxBorder" Property="BorderThickness" Value="2" /> |
| 143 | + </MultiTrigger> |
| 144 | + <MultiTrigger> |
| 145 | + <MultiTrigger.Conditions> |
| 146 | + <Condition Property="IsKeyboardFocused" Value="True" /> |
| 147 | + <Condition Property="wpf:TextFieldAssist.HasTextAreaBox" Value="True" /> |
| 148 | + </MultiTrigger.Conditions> |
| 149 | + <Setter TargetName="textFieldBoxBorder" Property="Margin" Value="-2" /> |
| 150 | + <Setter TargetName="textFieldBoxBorder" Property="BorderThickness" Value="2" /> |
| 151 | + <Setter TargetName="textFieldBoxBorder" Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}" /> |
| 152 | + </MultiTrigger> |
121 | 153 | </ControlTemplate.Triggers>
|
122 | 154 | </ControlTemplate>
|
123 | 155 | </Setter.Value>
|
|
137 | 169 | <Setter Property="wpf:HintAssist.IsFloating" Value="True"/>
|
138 | 170 | </Style>
|
139 | 171 |
|
140 |
| - <Style x:Key="MaterialDesignTextFieldBoxTextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource MaterialDesignTextBox}"> |
| 172 | + <Style x:Key="MaterialDesignTextFieldBoxTextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource MaterialDesignFloatingHintTextBox}"> |
141 | 173 | <Setter Property="wpf:TextFieldAssist.HasTextFieldBox" Value="True" />
|
142 |
| - <Setter Property="wpf:HintAssist.IsFloating" Value="True"/> |
| 174 | + </Style> |
| 175 | + |
| 176 | + <Style x:Key="MaterialDesignTextAreaTextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource MaterialDesignFloatingHintTextBox}"> |
| 177 | + <Setter Property="wpf:TextFieldAssist.HasTextAreaBox" Value="True" /> |
143 | 178 | </Style>
|
144 | 179 |
|
145 | 180 | </ResourceDictionary>
|
0 commit comments