Browse Source

Implemented TextAlignment property for TextBox.

pull/300/head
Mikhail Kanygin 11 years ago
parent
commit
a9f5042073
  1. 3
      samples/XamlTestApplicationPcl/Views/MainWindow.paml
  2. 2
      src/Perspex.Controls/Presenters/TextPresenter.cs
  3. 9
      src/Perspex.Controls/TextBox.cs
  4. 1
      src/Perspex.Themes.Default/TextBox.paml

3
samples/XamlTestApplicationPcl/Views/MainWindow.paml

@ -63,6 +63,9 @@
<TextBox Width="200" Watermark="Floating Watermark" UseFloatingWatermark="True" /> <TextBox Width="200" Watermark="Floating Watermark" UseFloatingWatermark="True" />
<TextBox AcceptsReturn="True" TextWrapping="Wrap" Width="200" Height="150" <TextBox AcceptsReturn="True" TextWrapping="Wrap" Width="200" Height="150"
Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est." /> Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est." />
<TextBox Width="200" Text="Left aligned text" TextAlignment="Left" />
<TextBox Width="200" Text="Center aligned text" TextAlignment="Center" />
<TextBox Width="200" Text="Right aligned text" TextAlignment="Right" />
<TextBlock Margin="0, 40, 0, 0" Text="CheckBox" FontWeight="Medium" FontSize="20" <TextBlock Margin="0, 40, 0, 0" Text="CheckBox" FontWeight="Medium" FontSize="20"
Foreground="#212121" /> Foreground="#212121" />
<TextBlock Text="A check box control" FontSize="13" Foreground="#727272" Margin="0, 0, 0, 10" /> <TextBlock Text="A check box control" FontSize="13" Foreground="#727272" Margin="0, 0, 0, 10" />

2
src/Perspex.Controls/Presenters/TextPresenter.cs

@ -180,7 +180,7 @@ namespace Perspex.Controls.Presenters
FontFamily, FontFamily,
FontSize, FontSize,
FontStyle, FontStyle,
TextAlignment.Left, TextAlignment,
FontWeight)) FontWeight))
{ {
return formattedText.Measure(); return formattedText.Measure();

9
src/Perspex.Controls/TextBox.cs

@ -37,6 +37,9 @@ namespace Perspex.Controls
public static readonly PerspexProperty<string> TextProperty = public static readonly PerspexProperty<string> TextProperty =
TextBlock.TextProperty.AddOwner<TextBox>(); TextBlock.TextProperty.AddOwner<TextBox>();
public static readonly PerspexProperty<TextAlignment> TextAlignmentProperty =
TextBlock.TextAlignmentProperty.AddOwner<TextBox>();
public static readonly PerspexProperty<TextWrapping> TextWrappingProperty = public static readonly PerspexProperty<TextWrapping> TextWrappingProperty =
TextBlock.TextWrappingProperty.AddOwner<TextBox>(); TextBlock.TextWrappingProperty.AddOwner<TextBox>();
@ -109,6 +112,12 @@ namespace Perspex.Controls
set { SetValue(TextProperty, value); } set { SetValue(TextProperty, value); }
} }
public TextAlignment TextAlignment
{
get { return GetValue(TextAlignmentProperty); }
set { SetValue(TextAlignmentProperty, value); }
}
public string Watermark public string Watermark
{ {
get { return GetValue(WatermarkProperty); } get { return GetValue(WatermarkProperty); }

1
src/Perspex.Themes.Default/TextBox.paml

@ -39,6 +39,7 @@
SelectionStart="{TemplateBinding SelectionStart}" SelectionStart="{TemplateBinding SelectionStart}"
SelectionEnd="{TemplateBinding SelectionEnd}" SelectionEnd="{TemplateBinding SelectionEnd}"
Text="{TemplateBinding Text}" Text="{TemplateBinding Text}"
TextAlignment="{TemplateBinding TextAlignment}"
TextWrapping="{TemplateBinding TextWrapping}"/> TextWrapping="{TemplateBinding TextWrapping}"/>
</Panel> </Panel>
</StackPanel> </StackPanel>

Loading…
Cancel
Save