diff options
Diffstat (limited to 'Software/Visual_Studio/Tango.Touch')
3 files changed, 9 insertions, 3 deletions
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs index dbda2320e..15c516124 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs @@ -73,7 +73,13 @@ namespace Tango.Touch.Controls public static readonly DependencyProperty DisplayWatermarkHintProperty = DependencyProperty.Register("DisplayWatermarkHint", typeof(bool), typeof(TouchNumericTextBox), new PropertyMetadata(false)); - + public bool HideUnderline + { + get { return (bool)GetValue(HideUnderlineProperty); } + set { SetValue(HideUnderlineProperty, value); } + } + public static readonly DependencyProperty HideUnderlineProperty = + DependencyProperty.Register("HideUnderline", typeof(bool), typeof(TouchNumericTextBox), new PropertyMetadata(false)); public String StringFormat { diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml index ff4756160..3fd056ee2 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml @@ -44,7 +44,7 @@ <TextBlock FontSize="12" Foreground="{StaticResource TangoValidationErrorBrush}" Margin="0 5 0 0" Text="{Binding RelativeSource={RelativeSource AncestorType=local:TouchNumericTextBox},Path=(Validation.Errors)/ErrorContent}"></TextBlock> </Canvas> <DockPanel> - <Grid DockPanel.Dock="Bottom" Height="2"> + <Grid DockPanel.Dock="Bottom" Height="2" Visibility="{Binding RelativeSource={RelativeSource Mode=TemplatedParent},Path=HideUnderline,Converter={StaticResource BooleanToVisibilityInverseConverter}}"> <Rectangle Height="1" Fill="{StaticResource TangoTextWatermarkBrush}" /> <Rectangle Height="2" RenderTransformOrigin="0.5,0.5" > <Rectangle.Style> diff --git a/Software/Visual_Studio/Tango.Touch/Styles/TouchNumericUpDownControl.xaml b/Software/Visual_Studio/Tango.Touch/Styles/TouchNumericUpDownControl.xaml index 1fc25c0ec..961b22c0f 100644 --- a/Software/Visual_Studio/Tango.Touch/Styles/TouchNumericUpDownControl.xaml +++ b/Software/Visual_Studio/Tango.Touch/Styles/TouchNumericUpDownControl.xaml @@ -82,7 +82,7 @@ </RepeatButton> <controls:TouchNumericTextBox x:Name="Number_PART" Margin="50 4 0 0" FontSize="{StaticResource TangoMessageBoxMessageFontSize}" HorizontalContentAlignment="Center" VerticalAlignment="Center" BorderBrush="{TemplateBinding BorderBrush}" VerticalContentAlignment="Center" UpdateBindingOnlyWhenFocused="True" - Value="{Binding Value,RelativeSource={RelativeSource AncestorType=controls:TouchNumericUpDownConrol}, Mode=TwoWay}" Minimum="{Binding MinValue,RelativeSource={RelativeSource AncestorType=controls:TouchNumericUpDownConrol}}" Maximum="{Binding MaxValue,RelativeSource={RelativeSource AncestorType=controls:TouchNumericUpDownConrol}, Mode=TwoWay}"/> + Value="{Binding Value,RelativeSource={RelativeSource AncestorType=controls:TouchNumericUpDownConrol}, Mode=TwoWay}" Minimum="{Binding MinValue,RelativeSource={RelativeSource AncestorType=controls:TouchNumericUpDownConrol}}" Maximum="{Binding MaxValue,RelativeSource={RelativeSource AncestorType=controls:TouchNumericUpDownConrol}, Mode=TwoWay}" HideUnderline="True"/> <RepeatButton Background="Transparent" Height="40" Margin="50 0 0 0" Padding="2" Style="{StaticResource emptyButton}" Command="{Binding Path=IncrementCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=controls:TouchNumericUpDownConrol}, Mode=TwoWay}" VerticalAlignment="Center"> |