|
216 | 216 | Appearance="Secondary" |
217 | 217 | Background="Transparent" |
218 | 218 | BorderBrush="Transparent" |
| 219 | + BorderThickness="0" |
219 | 220 | Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}" |
220 | 221 | CommandParameter="clear" |
221 | 222 | Cursor="Arrow" |
222 | 223 | Foreground="{DynamicResource TextControlButtonForeground}" |
223 | 224 | Icon="{StaticResource PasswordBoxClearIcon}" |
224 | | - IsTabStop="False" /> |
| 225 | + IsTabStop="False" |
| 226 | + MouseOverBackground="{DynamicResource SubtleFillColorSecondaryBrush}" |
| 227 | + MouseOverBorderBrush="Transparent" |
| 228 | + PressedBackground="{DynamicResource SubtleFillColorTertiaryBrush}" |
| 229 | + PressedBorderBrush="Transparent" /> |
225 | 230 |
|
226 | 231 | <controls:Button |
227 | 232 | x:Name="RevealButton" |
|
237 | 242 | Appearance="Secondary" |
238 | 243 | Background="Transparent" |
239 | 244 | BorderBrush="Transparent" |
| 245 | + BorderThickness="0" |
240 | 246 | Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}" |
241 | 247 | CommandParameter="reveal" |
242 | 248 | Cursor="Arrow" |
243 | 249 | Foreground="{DynamicResource TextControlButtonForeground}" |
244 | 250 | Icon="{StaticResource PasswordBoxRevealIcon}" |
245 | | - IsTabStop="False" /> |
| 251 | + IsTabStop="False" |
| 252 | + MouseOverBackground="{DynamicResource SubtleFillColorSecondaryBrush}" |
| 253 | + MouseOverBorderBrush="Transparent" |
| 254 | + PressedBackground="{DynamicResource SubtleFillColorTertiaryBrush}" |
| 255 | + PressedBorderBrush="Transparent" /> |
246 | 256 |
|
247 | 257 | <ContentPresenter |
248 | 258 | x:Name="ControlIconRight" |
|
308 | 318 | <Condition Property="IsEnabled" Value="True" /> |
309 | 319 | <Condition Property="IsMouseOver" Value="True" /> |
310 | 320 | <Condition Property="IsFocused" Value="False" /> |
| 321 | + <Condition SourceName="ClearButton" Property="IsFocused" Value="False" /> |
311 | 322 | </MultiTrigger.Conditions> |
312 | 323 | <Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" /> |
313 | 324 | </MultiTrigger> |
|
0 commit comments