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

fix padding

pull/4487/head
Jumar Macato 6 years ago
parent
06d93f3216
commit
ad78086d0a
No known key found for this signature in database GPG Key ID: B19884DAC3A5BF3F
1 changed files with 43 additions and 42 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. 85
      src/Avalonia.Themes.Fluent/TextBox.xaml

85
src/Avalonia.Themes.Fluent/TextBox.xaml
View File

@ -37,31 +37,30 @@
</Border> </Border>
<Border <Border
Padding="{TemplateBinding Padding}"
Margin="{TemplateBinding BorderThickness}"> Margin="{TemplateBinding BorderThickness}">
<DockPanel> <Grid ColumnDefinitions="Auto,*,Auto" >
<TextBlock Name="floatingWatermark" <ContentPresenter Grid.Column="0" Grid.ColumnSpan="1" Content="{TemplateBinding InnerLeftContent}"/>
Foreground="{DynamicResource SystemAccentColor}" <DockPanel Grid.Column="1" Grid.ColumnSpan="1" Margin="{TemplateBinding Padding}">
FontSize="{DynamicResource FontSizeSmall}" <TextBlock Name="floatingWatermark"
Text="{TemplateBinding Watermark}" Foreground="{DynamicResource SystemAccentColor}"
DockPanel.Dock="Top"> FontSize="{DynamicResource FontSizeSmall}"
<TextBlock.IsVisible> Text="{TemplateBinding Watermark}"
<MultiBinding Converter="{x:Static BoolConverters.And}"> DockPanel.Dock="Top">
<Binding RelativeSource="{RelativeSource TemplatedParent}" <TextBlock.IsVisible>
Path="UseFloatingWatermark"/> <MultiBinding Converter="{x:Static BoolConverters.And}">
<Binding RelativeSource="{RelativeSource TemplatedParent}" <Binding RelativeSource="{RelativeSource TemplatedParent}"
Path="Text" Path="UseFloatingWatermark"/>
Converter="{x:Static StringConverters.IsNotNullOrEmpty}"/> <Binding RelativeSource="{RelativeSource TemplatedParent}"
</MultiBinding> Path="Text"
</TextBlock.IsVisible> Converter="{x:Static StringConverters.IsNotNullOrEmpty}"/>
</TextBlock> </MultiBinding>
</TextBlock.IsVisible>
<DataValidationErrors> </TextBlock>
<ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"> <DataValidationErrors>
<Grid ColumnDefinitions="Auto,*,Auto"> <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
<ContentPresenter Grid.Column="0" Grid.ColumnSpan="1" Content="{TemplateBinding InnerLeftContent}"/> VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
<Panel Grid.Column="1" Grid.ColumnSpan="1"> <Panel>
<TextBlock Name="watermark" <TextBlock Name="watermark"
Opacity="0.5" Opacity="0.5"
Text="{TemplateBinding Watermark}" Text="{TemplateBinding Watermark}"
@ -72,26 +71,28 @@
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/> VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
<!-- TODO eliminate this margin... text layout issue? --> <!-- TODO eliminate this margin... text layout issue? -->
<TextPresenter Name="PART_TextPresenter" <TextPresenter Name="PART_TextPresenter"
Margin="0 1 0 0" Margin="0 1 0 0"
Text="{TemplateBinding Text, Mode=TwoWay}" Text="{TemplateBinding Text, Mode=TwoWay}"
CaretIndex="{TemplateBinding CaretIndex}" CaretIndex="{TemplateBinding CaretIndex}"
SelectionStart="{TemplateBinding SelectionStart}" SelectionStart="{TemplateBinding SelectionStart}"
SelectionEnd="{TemplateBinding SelectionEnd}" SelectionEnd="{TemplateBinding SelectionEnd}"
TextAlignment="{TemplateBinding TextAlignment}" TextAlignment="{TemplateBinding TextAlignment}"
TextWrapping="{TemplateBinding TextWrapping}" TextWrapping="{TemplateBinding TextWrapping}"
PasswordChar="{TemplateBinding PasswordChar}" PasswordChar="{TemplateBinding PasswordChar}"
SelectionBrush="{TemplateBinding SelectionBrush}" SelectionBrush="{TemplateBinding SelectionBrush}"
SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}" SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
CaretBrush="{TemplateBinding CaretBrush}" CaretBrush="{TemplateBinding CaretBrush}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/> VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Panel> </Panel>
<ContentPresenter Grid.Column="0" Grid.ColumnSpan="1" Content="{TemplateBinding InnerRightContent}"/> </ScrollViewer>
</Grid> </DataValidationErrors>
</ScrollViewer> </DockPanel>
</DataValidationErrors> <ContentPresenter Grid.Column="2" Grid.ColumnSpan="1" Content="{TemplateBinding InnerRightContent}"/>
</DockPanel> </Grid>
</Border> </Border>
</Panel> </Panel>
</DockPanel> </DockPanel>
</ControlTemplate> </ControlTemplate>

Write Preview
Loading…
Cancel
Save