Skip to content

fix(controls): Fix PasswordBox various issues #1501

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

Merged
pomianowski merged 7 commits into from
Nov 7, 2025
Merged

fix(controls): Fix PasswordBox various issues #1501

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb58d9c
Update PasswordBox.cs
Nuklon Aug 5, 2025
a007ca2
Center buttons/icons to follow TextBox style
Nuklon Aug 5, 2025
59c8f1c
Update PasswordBox.xaml
Nuklon Aug 5, 2025
b8c95c8
Update PasswordBox.xaml
Nuklon Aug 5, 2025
a7b4825
Update PasswordBox.xaml
Nuklon Aug 5, 2025
bffb347
Unify remainder
Nuklon Aug 5, 2025
cd2674f
Merge branch 'main' into patch-17
Nuklon Nov 7, 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
16 changes: 8 additions & 8 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 @@ -31,9 +31,9 @@

<Thickness x:Key="PasswordBoxBorderThemeThickness">1,1,1,1</Thickness>
<Thickness x:Key="PasswordBoxAccentBorderThemeThickness">0,0,0,1</Thickness>
<Thickness x:Key="PasswordBoxLeftIconMargin">10,8,0,0</Thickness>
<Thickness x:Key="PasswordBoxRightIconMargin">0,8,10,0</Thickness>
<Thickness x:Key="PasswordBoxButtonMargin">0,5,4,0</Thickness>
Comment on lines -34 to -36
Copy link
Collaborator Author

@Nuklon Nuklon Aug 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Identical to TextBox now (copied from there).

<Thickness x:Key="PasswordBoxLeftIconMargin">10,0,0,0</Thickness>
<Thickness x:Key="PasswordBoxRightIconMargin">0,0,10,0</Thickness>
<Thickness x:Key="PasswordBoxButtonMargin">0,0,4,0</Thickness>
<Thickness x:Key="PasswordBoxButtonPadding">0,0,0,0</Thickness>
<system:Double x:Key="PasswordBoxButtonHeight">24</system:Double>
<system:Double x:Key="PasswordBoxButtonIconSize">14</system:Double>
Expand Down Expand Up @@ -182,7 +182,7 @@
x:Name="ControlIconLeft"
Grid.Column="0"
Margin="{StaticResource PasswordBoxLeftIconMargin}"
VerticalAlignment="Top"
VerticalAlignment="Center"
Content="{TemplateBinding Icon}"
TextElement.FontSize="16"
TextElement.Foreground="{TemplateBinding Foreground}" />
Expand All @@ -196,7 +196,7 @@
x:Name="PlaceholderTextBox"
Margin="0"
Padding="1,0"
VerticalAlignment="Top"
VerticalAlignment="Center"
Foreground="{DynamicResource TextControlPlaceholderForeground}"
Text="{TemplateBinding PlaceholderText}" />
</Grid>
Expand All @@ -210,7 +210,7 @@
Margin="{StaticResource PasswordBoxButtonMargin}"
Padding="{StaticResource PasswordBoxButtonPadding}"
HorizontalAlignment="Center"
VerticalAlignment="Top"
VerticalAlignment="Center"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Appearance="Secondary"
Expand All @@ -236,7 +236,7 @@
Margin="{StaticResource PasswordBoxButtonMargin}"
Padding="{StaticResource PasswordBoxButtonPadding}"
HorizontalAlignment="Center"
VerticalAlignment="Top"
VerticalAlignment="Center"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Appearance="Secondary"
Expand All @@ -258,7 +258,7 @@
x:Name="ControlIconRight"
Grid.Column="4"
Margin="{StaticResource PasswordBoxRightIconMargin}"
VerticalAlignment="Top"
VerticalAlignment="Center"
Content="{TemplateBinding Icon}"
TextElement.FontSize="16"
TextElement.Foreground="{TemplateBinding Foreground}" />
Expand Down
Loading