Skip to content

Fix for 2835 - Apply cursor fix for PasswordBox the same way it was done for TextBox #2836

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

Closed
nicolaihenriksen wants to merge 1 commit into from
Closed

Fix for 2835 - Apply cursor fix for PasswordBox the same way it was done for TextBox #2836

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,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 @@ -35,15 +37,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 @@ -92,7 +93,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