Browse Source
Merge branch 'master' into feature/separate-runtime-xaml-loader
pull/4318/head
Nikita Tsukanov
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
0 deletions
-
src/Avalonia.Themes.Default/TextBox.xaml
-
src/Avalonia.Themes.Fluent/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}" |
|
|
|
|
|
|
|
@ -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" |
|
|
|
|
