tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed TextBox floating watermark. 

It should not scroll with TextBox contents.
pull/484/head
Steven Kirk 11 years ago
parent
8f0d63db73
commit
42ccfebf17
1 changed files with 24 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      src/Perspex.Themes.Default/TextBox.xaml

44
src/Perspex.Themes.Default/TextBox.xaml
View File

@ -10,24 +10,27 @@
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"> BorderThickness="{TemplateBinding BorderThickness}">
<ScrollViewer CanScrollHorizontally="{TemplateBinding CanScrollHorizontally}" <DockPanel Margin="{TemplateBinding Padding}">
HorizontalScrollBarVisibility="{TemplateBinding HorizontalScrollBarVisibility}"
VerticalScrollBarVisibility="{TemplateBinding VerticalScrollBarVisibility}"> <TextBlock Name="floatingWatermark"
<StackPanel Margin="{TemplateBinding Padding}"> Foreground="{StyleResource ThemeAccentBrush}"
<TextBlock Name="floatingWatermark" FontSize="{StyleResource FontSizeSmall}"
Foreground="{StyleResource ThemeAccentBrush}" Text="{TemplateBinding Watermark}"
FontSize="{StyleResource FontSizeSmall}" DockPanel.Dock="Top">
Text="{TemplateBinding Watermark}"> <TextBlock.IsVisible>
<TextBlock.IsVisible> <MultiBinding Converter="{Static BoolConverters.And}">
<MultiBinding Converter="{Static BoolConverters.And}"> <Binding RelativeSource="{RelativeSource TemplatedParent}"
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="UseFloatingWatermark"/>
Path="UseFloatingWatermark"/> <Binding RelativeSource="{RelativeSource TemplatedParent}"
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Text"
Path="Text" Converter="{Static StringConverters.NotNullOrEmpty}"/>
Converter="{Static StringConverters.NotNullOrEmpty}"/> </MultiBinding>
</MultiBinding> </TextBlock.IsVisible>
</TextBlock.IsVisible> </TextBlock>
</TextBlock>
<ScrollViewer CanScrollHorizontally="{TemplateBinding CanScrollHorizontally}"
HorizontalScrollBarVisibility="{TemplateBinding HorizontalScrollBarVisibility}"
VerticalScrollBarVisibility="{TemplateBinding VerticalScrollBarVisibility}">
<Panel> <Panel>
<TextBlock Name="watermark" <TextBlock Name="watermark"
Opacity="0.5" Opacity="0.5"
@ -41,8 +44,9 @@
TextAlignment="{TemplateBinding TextAlignment}" TextAlignment="{TemplateBinding TextAlignment}"
TextWrapping="{TemplateBinding TextWrapping}"/> TextWrapping="{TemplateBinding TextWrapping}"/>
</Panel> </Panel>
</StackPanel> </ScrollViewer>
</ScrollViewer>
</DockPanel>
</Border> </Border>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>

Write Preview
Loading…
Cancel
Save