Skip to content

Fix {Password/Text}Box clear button design #1520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix {Password/Text}Box clear button design #1520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
022f407
Fix TextBox clear button design
Nuklon Aug 25, 2025
b790cf4
Update PasswordBox.xaml
Nuklon Aug 25, 2025
3bce320
Update TextBox.xaml
Nuklon Aug 28, 2025
e985ec9
Update PasswordBox.xaml
Nuklon Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,17 @@
Appearance="Secondary"
Background="Transparent"
BorderBrush="Transparent"
BorderThickness="0"
Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
CommandParameter="clear"
Cursor="Arrow"
Foreground="{DynamicResource TextControlButtonForeground}"
Icon="{StaticResource PasswordBoxClearIcon}"
IsTabStop="False" />
IsTabStop="False"
MouseOverBackground="{DynamicResource SubtleFillColorSecondaryBrush}"
MouseOverBorderBrush="Transparent"
PressedBackground="{DynamicResource SubtleFillColorTertiaryBrush}"
PressedBorderBrush="Transparent" />

<controls:Button
x:Name="RevealButton"
Expand All @@ -237,12 +242,17 @@
Appearance="Secondary"
Background="Transparent"
BorderBrush="Transparent"
BorderThickness="0"
Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
CommandParameter="reveal"
Cursor="Arrow"
Foreground="{DynamicResource TextControlButtonForeground}"
Icon="{StaticResource PasswordBoxRevealIcon}"
IsTabStop="False" />
IsTabStop="False"
MouseOverBackground="{DynamicResource SubtleFillColorSecondaryBrush}"
MouseOverBorderBrush="Transparent"
PressedBackground="{DynamicResource SubtleFillColorTertiaryBrush}"
PressedBorderBrush="Transparent" />

<ContentPresenter
x:Name="ControlIconRight"
Expand Down Expand Up @@ -308,6 +318,7 @@
<Condition Property="IsEnabled" Value="True" />
<Condition Property="IsMouseOver" Value="True" />
<Condition Property="IsFocused" Value="False" />
<Condition SourceName="ClearButton" Property="IsFocused" Value="False" />
</MultiTrigger.Conditions>
<Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
</MultiTrigger>
Expand Down
8 changes: 7 additions & 1 deletion src/Wpf.Ui/Controls/TextBox/TextBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,15 @@
Appearance="Secondary"
Background="Transparent"
BorderBrush="Transparent"
BorderThickness="0"
Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
Cursor="Arrow"
Foreground="{DynamicResource TextControlButtonForeground}"
IsTabStop="False">
IsTabStop="False"
MouseOverBackground="{DynamicResource SubtleFillColorSecondaryBrush}"
MouseOverBorderBrush="Transparent"
PressedBackground="{DynamicResource SubtleFillColorTertiaryBrush}"
PressedBorderBrush="Transparent">
<controls:Button.Icon>
<controls:SymbolIcon FontSize="{TemplateBinding FontSize}" Symbol="Dismiss24" />
</controls:Button.Icon>
Expand Down Expand Up @@ -253,6 +258,7 @@
<Condition Property="IsEnabled" Value="True" />
<Condition Property="IsMouseOver" Value="True" />
<Condition Property="IsFocused" Value="False" />
<Condition SourceName="ClearButton" Property="IsFocused" Value="False" />
</MultiTrigger.Conditions>
<Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
</MultiTrigger>
Expand Down