diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2022-01-20 17:22:35 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2022-01-20 17:22:35 +0200 |
| commit | 873de6078c8e53067ce772d8bfb214dc026ac54e (patch) | |
| tree | 1cbee36a5d95c48898f870c038c03ffcebc9248e /Software/Visual_Studio/Tango.Touch/Controls | |
| parent | 503839dc2436d6310c7e71df80d1c22ba21614de (diff) | |
| download | Tango-873de6078c8e53067ce772d8bfb214dc026ac54e.tar.gz Tango-873de6078c8e53067ce772d8bfb214dc026ac54e.zip | |
Resolved some bugs in new UI PPC
Related Work Items: #6127, #6130, #6136, #6137, #6138
Diffstat (limited to 'Software/Visual_Studio/Tango.Touch/Controls')
| -rw-r--r-- | Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs | 5 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.Touch/Controls/TouchNumericUpDownConrol.xaml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs index 224f2d25b..77891b36b 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs @@ -280,6 +280,11 @@ namespace Tango.Touch.Controls e.Handled = true; return; } + else if(e.Text == "." && HasDecimalPoint) + { + e.Handled = false; + return; + } if (e.Text == "-" && !_text_box.Text.Contains("-")) { diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericUpDownConrol.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericUpDownConrol.xaml index 8963c9c3e..a47d890b7 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericUpDownConrol.xaml +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericUpDownConrol.xaml @@ -81,7 +81,7 @@ <Border Background="Transparent" BorderBrush="{StaticResource TangoGrayBrush}" BorderThickness="0.8" CornerRadius="2" Width="54"> <local:TouchNumericTextBox x:Name="Number_PART" Margin="0 4 0 0" FontSize="20" HorizontalContentAlignment="Center" VerticalAlignment="Center" BorderBrush="{TemplateBinding BorderBrush}" VerticalContentAlignment="Center" UpdateBindingOnlyWhenFocused="True" - Value="{Binding Value,RelativeSource={RelativeSource AncestorType=local:TouchNumericUpDownConrol}}" Minimum="{Binding MinValue,RelativeSource={RelativeSource AncestorType=local:TouchNumericUpDownConrol}}" Maximum="{Binding MaxValue,RelativeSource={RelativeSource AncestorType=local:TouchNumericUpDownConrol}}"/> + Value="{Binding Value,RelativeSource={RelativeSource AncestorType=local:TouchNumericUpDownConrol}}" Minimum="{Binding MinValue,RelativeSource={RelativeSource AncestorType=local:TouchNumericUpDownConrol}}" Maximum="{Binding MaxValue,RelativeSource={RelativeSource AncestorType=local:TouchNumericUpDownConrol}}" HasDecimalPoint="True" StringFormat="0.#"/> </Border> <Border Margin="10 0 0 0" BorderBrush="{StaticResource TangoGrayBrush}" BorderThickness="0.8" Width="80"> |