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

Fix TextBox/error icon scrolling.

pull/691/head
Steven Kirk 10 years ago
parent
9094de563e
commit
7a2adc63e9
1 changed files with 25 additions and 23 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. 48
      src/Avalonia.Themes.Default/TextBox.xaml

48
src/Avalonia.Themes.Default/TextBox.xaml
View File

@ -27,37 +27,39 @@
</MultiBinding> </MultiBinding>
</TextBlock.IsVisible> </TextBlock.IsVisible>
</TextBlock> </TextBlock>
<ScrollViewer CanScrollHorizontally="{TemplateBinding CanScrollHorizontally}" <DockPanel LastChildFill="True">
HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}" <Panel Name="error" DockPanel.Dock="Right" Margin="4 0 0 0">
VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"> <ToolTip.Tip>
<ItemsControl Items="{TemplateBinding DataValidationErrors}" MemberSelector="Message"/>
</ToolTip.Tip>
<!-- TODO: Draw as a path -->
<Ellipse Width="14" Height="14" Stroke="{StyleResource ErrorBrush}" StrokeThickness="1"/>
<Path Data="M7,4l0,5" Stroke="{StyleResource ErrorBrush}" StrokeThickness="2"/>
<Path Data="M7,10l0,2" Stroke="{StyleResource ErrorBrush}" StrokeThickness="2"/>
</Panel>
<ScrollViewer CanScrollHorizontally="{TemplateBinding CanScrollHorizontally}"
HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
<Panel> <Panel>
<TextBlock Name="watermark" <TextBlock Name="watermark"
Opacity="0.5" Opacity="0.5"
Text="{TemplateBinding Watermark}" Text="{TemplateBinding Watermark}"
IsVisible="{TemplateBinding Path=Text, Converter={Static StringConverters.NullOrEmpty}}"/> IsVisible="{TemplateBinding Path=Text, Converter={Static StringConverters.NullOrEmpty}}"/>
<DockPanel LastChildFill="True"> <TextPresenter Name="PART_TextPresenter"
<Panel Name="error" DockPanel.Dock="Right"> CaretIndex="{TemplateBinding CaretIndex}"
<ToolTip.Tip> SelectionStart="{TemplateBinding SelectionStart}"
<ItemsControl Items="{TemplateBinding DataValidationErrors}" MemberSelector="Message"/> SelectionEnd="{TemplateBinding SelectionEnd}"
</ToolTip.Tip> Text="{TemplateBinding Text, Mode=TwoWay}"
<!-- TODO: Draw as a path --> TextAlignment="{TemplateBinding TextAlignment}"
<Ellipse Width="14" Height="14" Stroke="{StyleResource ErrorBrush}" StrokeThickness="1"/> TextWrapping="{TemplateBinding TextWrapping}"/>
<Path Data="M7,4l0,5" Stroke="{StyleResource ErrorBrush}" StrokeThickness="2"/>
<Path Data="M7,10l0,2" Stroke="{StyleResource ErrorBrush}" StrokeThickness="2"/>
</Panel>
<TextPresenter Name="PART_TextPresenter"
CaretIndex="{TemplateBinding CaretIndex}"
SelectionStart="{TemplateBinding SelectionStart}"
SelectionEnd="{TemplateBinding SelectionEnd}"
Text="{TemplateBinding Text, Mode=TwoWay}"
TextAlignment="{TemplateBinding TextAlignment}"
TextWrapping="{TemplateBinding TextWrapping}"/>
</DockPanel>
</Panel> </Panel>
</ScrollViewer> </ScrollViewer>
</DockPanel> </DockPanel>
</DockPanel>
</Border> </Border>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>

Write Preview
Loading…
Cancel
Save