|
|
@@ -14,8 +14,8 @@ namespace Avalonia.Controls.Presenters
|
|
|
o => o.CaretIndex,
|
|
|
(o, v) => o.CaretIndex = v);
|
|
|
|
|
|
- public static readonly StyledProperty<bool> RevealPasswordTextProperty =
|
|
|
- AvaloniaProperty.Register<TextPresenter, bool>(nameof(RevealPasswordText));
|
|
|
+ public static readonly StyledProperty<bool> RevealPasswordProperty =
|
|
|
+ AvaloniaProperty.Register<TextPresenter, bool>(nameof(RevealPassword));
|
|
|
|
|
|
public static readonly StyledProperty<char> PasswordCharProperty =
|
|
|
AvaloniaProperty.Register<TextPresenter, char>(nameof(PasswordChar));
|
|
|
@@ -78,7 +78,7 @@ namespace Avalonia.Controls.Presenters
|
|
|
static TextPresenter()
|
|
|
{
|
|
|
AffectsRender<TextPresenter>(SelectionBrushProperty);
|
|
|
- AffectsMeasure<TextPresenter>(TextProperty, PasswordCharProperty, RevealPasswordTextProperty,
|
|
|
+ AffectsMeasure<TextPresenter>(TextProperty, PasswordCharProperty, RevealPasswordProperty,
|
|
|
TextAlignmentProperty, TextWrappingProperty, TextBlock.FontSizeProperty,
|
|
|
TextBlock.FontStyleProperty, TextBlock.FontWeightProperty, TextBlock.FontFamilyProperty);
|
|
|
|
|
|
@@ -87,7 +87,7 @@ namespace Avalonia.Controls.Presenters
|
|
|
TextBlock.FontSizeProperty.Changed, TextBlock.FontStyleProperty.Changed,
|
|
|
TextBlock.FontWeightProperty.Changed, TextBlock.FontFamilyProperty.Changed,
|
|
|
SelectionStartProperty.Changed, SelectionEndProperty.Changed,
|
|
|
- SelectionForegroundBrushProperty.Changed, PasswordCharProperty.Changed, RevealPasswordTextProperty.Changed
|
|
|
+ SelectionForegroundBrushProperty.Changed, PasswordCharProperty.Changed, RevealPasswordProperty.Changed
|
|
|
).AddClassHandler<TextPresenter>((x, _) => x.InvalidateFormattedText());
|
|
|
|
|
|
CaretIndexProperty.Changed.AddClassHandler<TextPresenter>((x, e) => x.CaretIndexChanged((int)e.NewValue));
|
|
|
@@ -213,10 +213,10 @@ namespace Avalonia.Controls.Presenters
|
|
|
set => SetValue(PasswordCharProperty, value);
|
|
|
}
|
|
|
|
|
|
- public bool RevealPasswordText
|
|
|
+ public bool RevealPassword
|
|
|
{
|
|
|
- get => GetValue(RevealPasswordTextProperty);
|
|
|
- set => SetValue(RevealPasswordTextProperty, value);
|
|
|
+ get => GetValue(RevealPasswordProperty);
|
|
|
+ set => SetValue(RevealPasswordProperty, value);
|
|
|
}
|
|
|
|
|
|
public IBrush SelectionBrush
|
|
|
@@ -435,7 +435,7 @@ namespace Avalonia.Controls.Presenters
|
|
|
|
|
|
var text = Text;
|
|
|
|
|
|
- if (PasswordChar != default(char) && !RevealPasswordText)
|
|
|
+ if (PasswordChar != default(char) && !RevealPassword)
|
|
|
{
|
|
|
result = CreateFormattedTextInternal(_constraint, new string(PasswordChar, text?.Length ?? 0));
|
|
|
}
|