Skip to content

New feature - PasswordBox styles with "reveal password" functionality #2828

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
Keboo merged 28 commits into from
Sep 9, 2022
Merged

New feature - PasswordBox styles with "reveal password" functionality #2828

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
db3f3ac
Initial PasswordBox "revealed" styles
nicolaihenriksen Aug 23, 2022
135cee0
Fixed alignment and initial wiring up
nicolaihenriksen Aug 23, 2022
f6e44e6
Showcasing style in sample app + alignment of reveal button
nicolaihenriksen Aug 23, 2022
66f1834
Showcase that password can still be set from XAML
nicolaihenriksen Aug 23, 2022
8d9c4f7
Change PasswordChanged event handler to weak event pattern
nicolaihenriksen Aug 24, 2022
22c0d31
Updated showcasing in the demo tool with a bit more stuff
nicolaihenriksen Aug 24, 2022
dd93d4a
Fixed CA warning
nicolaihenriksen Aug 24, 2022
9396459
Added UI test for 3-way binding
nicolaihenriksen Aug 29, 2022
df940a8
[Icon update detected by Github Action]. Auto generated pull request.…
github-actions[bot] Aug 30, 2022
8361fb8
Cursor fix (#2832)
nicolaihenriksen Aug 30, 2022
76eab1e
Fixed embedded dialog host style (#2826) (#2829)
Erapchu Aug 30, 2022
e6f81bf
Fix for 2596 - Align left margin for error message on outlined TextBo…
nicolaihenriksen Aug 30, 2022
6a08d55
Let DataGridCell handle mouse events itself when already editing (#2821)
nicolaihenriksen Aug 30, 2022
13b2483
Refactoring DataGridAssist input handling (#2824)
nicolaihenriksen Aug 30, 2022
63fed76
Initial PasswordBox "revealed" styles
nicolaihenriksen Aug 23, 2022
7798000
Fixed alignment and initial wiring up
nicolaihenriksen Aug 23, 2022
17aacdd
Showcasing style in sample app + alignment of reveal button
nicolaihenriksen Aug 23, 2022
1506b49
Showcase that password can still be set from XAML
nicolaihenriksen Aug 23, 2022
293f9cf
Change PasswordChanged event handler to weak event pattern
nicolaihenriksen Aug 24, 2022
a3c60ba
Updated showcasing in the demo tool with a bit more stuff
nicolaihenriksen Aug 24, 2022
438eae1
Fixed CA warning
nicolaihenriksen Aug 24, 2022
e0d208d
Added UI test for 3-way binding
nicolaihenriksen Aug 29, 2022
a7f23a4
Resolving merge conflicts
nicolaihenriksen Aug 30, 2022
cb8bbd1
Merge remote-tracking branch 'origin/featureRevealPasswordBox' into f…
nicolaihenriksen Aug 30, 2022
52c3c23
Resolving merge conflicts
nicolaihenriksen Aug 30, 2022
7b2c56e
Fixing hint proxy issues with password box
Keboo Aug 30, 2022
87070e3
Moved samples and added SMTX wrapper
nicolaihenriksen Aug 30, 2022
0f8187a
Apply cursor fix
nicolaihenriksen Aug 31, 2022
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
Prev Previous commit
Apply cursor fix
  • Loading branch information
@nicolaihenriksen
nicolaihenriksen committed Aug 31, 2022
commit 0f8187a8baed40d4c94f74e3b29bf9bc35e7f2d7
14 changes: 7 additions & 7 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<converters:NotConverter x:Key="NotConverter" />
<converters:MathConverter x:Key="MathMultiplyConverter" Operation="Multiply" />
<converters:FloatingHintOffsetCalculationConverter x:Key="FloatingHintOffsetCalculationConverter" />
<converters:CursorConverter x:Key="ArrowCursorConverter" FallbackCursor="Arrow" />
<converters:CursorConverter x:Key="IBeamCursorConverter" FallbackCursor="IBeam" />

<Style x:Key="MaterialDesignPasswordBox" TargetType="{x:Type PasswordBox}">
<Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
Expand All @@ -36,15 +38,14 @@
<Setter Property="wpf:TextFieldAssist.UnderlineBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="wpf:HintAssist.Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="ContextMenu" Value="{StaticResource MaterialDesignDefaultContextMenu}" />
<Setter Property="Cursor" Value="Arrow" />
<Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
<Setter Property="FontFamily" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.FontFamily)}" />
<Setter Property="PasswordChar" Value="●" />
<Setter Property="internal:ClearText.HandlesClearCommand" Value="True" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type PasswordBox}">
<Grid>
<Grid Cursor="{TemplateBinding Cursor, Converter={StaticResource ArrowCursorConverter}}">
<Border
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Expand Down Expand Up @@ -93,7 +94,7 @@
Grid.Column="1"
Panel.ZIndex="1"
wpf:ScrollViewerAssist.IgnorePadding="True"
Cursor="IBeam"
Cursor="{TemplateBinding Cursor, Converter={StaticResource IBeamCursorConverter}}"
Focusable="false"
HorizontalScrollBarVisibility="Hidden"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
Expand Down Expand Up @@ -470,7 +471,6 @@
<Setter Property="wpf:TextFieldAssist.UnderlineBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="wpf:HintAssist.Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="ContextMenu" Value="{StaticResource MaterialDesignDefaultContextMenu}" />
<Setter Property="Cursor" Value="Arrow" />
<Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
<Setter Property="FontFamily" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.FontFamily)}" />
<Setter Property="PasswordChar" Value="●" />
Expand All @@ -490,7 +490,6 @@
<ScrollViewer
x:Name="PART_ContentHost"
wpf:ScrollViewerAssist.IgnorePadding="True"
Cursor="IBeam"
Margin="-2 0"
HorizontalScrollBarVisibility="Hidden"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
Expand Down Expand Up @@ -519,7 +518,7 @@

</Style>
</ControlTemplate.Resources>
<Grid>
<Grid Cursor="{TemplateBinding Cursor, Converter={StaticResource ArrowCursorConverter}}">
<Border
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Expand Down Expand Up @@ -577,7 +576,7 @@
<ScrollViewer
x:Name="PART_ContentHost"
wpf:ScrollViewerAssist.IgnorePadding="True"
Cursor="IBeam"
Cursor="{TemplateBinding Cursor, Converter={StaticResource IBeamCursorConverter}}"
Focusable="false"
HorizontalScrollBarVisibility="Hidden"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
Expand All @@ -587,6 +586,7 @@
<TextBox
x:Name="RevealPasswordTextBox"
Grid.Column="0"
Cursor="{TemplateBinding Cursor, Converter={StaticResource IBeamCursorConverter}}"
Foreground="{TemplateBinding Foreground}"
CaretBrush="{TemplateBinding CaretBrush}"
SelectionBrush="{TemplateBinding SelectionBrush}"
Expand Down