Browse Source

Use TextBox text alignment and wrapping in watermark.

pull/4314/head
José Pedro 6 years ago
parent
commit
856118f21c
No known key found for this signature in database GPG Key ID: B8247B9301707B83
  1. 2
      src/Avalonia.Themes.Default/TextBox.xaml
  2. 2
      src/Avalonia.Themes.Fluent/TextBox.xaml

2
src/Avalonia.Themes.Default/TextBox.xaml

@ -40,6 +40,8 @@
<TextBlock Name="watermark"
Opacity="0.5"
Text="{TemplateBinding Watermark}"
TextAlignment="{TemplateBinding TextAlignment}"
TextWrapping="{TemplateBinding TextWrapping}"
IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"/>
<TextPresenter Name="PART_TextPresenter"
Text="{TemplateBinding Text, Mode=TwoWay}"

2
src/Avalonia.Themes.Fluent/TextBox.xaml

@ -72,6 +72,8 @@
<TextBlock Name="watermark"
Opacity="0.5"
Text="{TemplateBinding Watermark}"
TextAlignment="{TemplateBinding TextAlignment}"
TextWrapping="{TemplateBinding TextWrapping}"
IsVisible="{TemplateBinding Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"/>
<!-- TODO eliminate this margin... text layout issue? -->
<TextPresenter Name="PART_TextPresenter"

Loading…
Cancel
Save