diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2022-03-03 15:02:36 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2022-03-03 15:02:36 +0200 |
| commit | d683f10b771676889543ad09494f2244db01198d (patch) | |
| tree | a80746ef539c17c892fde7989a351e8f861be8bf /Software/Visual_Studio/Tango.Touch | |
| parent | f6e4ed5a21280669175a433714c22007e08e7b92 (diff) | |
| download | Tango-d683f10b771676889543ad09494f2244db01198d.tar.gz Tango-d683f10b771676889543ad09494f2244db01198d.zip | |
Added label to touch slider three thumbs.
Related Work Items: #6227
Diffstat (limited to 'Software/Visual_Studio/Tango.Touch')
3 files changed, 23 insertions, 5 deletions
diff --git a/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/MultiRangeSlider.cs b/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/MultiRangeSlider.cs index 0cfd74f5c..b0b7167ee 100644 --- a/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/MultiRangeSlider.cs +++ b/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/MultiRangeSlider.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using System.Windows.Controls; using System.Windows; using System.Windows.Controls.Primitives; +using System.Windows.Input; namespace Tango.Touch.Controls { @@ -167,7 +168,22 @@ namespace Tango.Touch.Controls { DefaultStyleKeyProperty.OverrideMetadata(typeof(MultiRangeSlider), new FrameworkPropertyMetadata(typeof(MultiRangeSlider))); } - + + public override void OnApplyTemplate() + { + base.OnApplyTemplate(); + + TouchDown -= TouchDownSlider; + TouchDown += TouchDownSlider; + OnValueChanged(Double.NaN, Value); + IsMoveToPointEnabled = true; + } + + private void TouchDownSlider(object sender, TouchEventArgs e) + { + e.Handled = true; + } + #region change and validate value protected override void OnThumbDragStarted(DragStartedEventArgs e) diff --git a/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/MultiRangeSlider.xaml b/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/MultiRangeSlider.xaml index 2d76c6845..1d1ce4f89 100644 --- a/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/MultiRangeSlider.xaml +++ b/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/MultiRangeSlider.xaml @@ -45,7 +45,9 @@ <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}"/> <RowDefinition Height="Auto"/> </Grid.RowDefinitions> - + <Grid.ColumnDefinitions> + <ColumnDefinition Width="*"/> + </Grid.ColumnDefinitions> <!--<Rectangle x:Name="PART_SelectionRange"/>--> <Border x:Name="PART_SelectionRange" Grid.Row="1" BorderThickness="0" Height="0" /> diff --git a/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/TouchSliderThreeThumbs.xaml b/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/TouchSliderThreeThumbs.xaml index 20319c8ad..08df0a428 100644 --- a/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/TouchSliderThreeThumbs.xaml +++ b/Software/Visual_Studio/Tango.Touch/TouchColorPickerControls/TouchSliderThreeThumbs.xaml @@ -17,12 +17,12 @@ </Border> <local:MultiRangeSlider x:Name="PART_LowerSlider" Height="32" Margin="0 0 0 0" Minimum="0" Maximum="100" Foreground="{StaticResource TangoDarkForegroundBrush}" - IsSnapToTickEnabled="True" TickFrequency="1" AutoToolTipPlacement="BottomRight"/> + IsSnapToTickEnabled="True" TickFrequency="1" /> <local:MultiRangeSlider x:Name="Part_MiddleSlider" Height="32" Margin="10 0 0 0" Minimum="0" Maximum="100" Foreground="{StaticResource TangoDarkForegroundBrush}" - IsSnapToTickEnabled="True" TickFrequency="1" AutoToolTipPlacement="BottomRight" /> + IsSnapToTickEnabled="True" TickFrequency="1" /> <local:MultiRangeSlider x:Name="PART_UpperSlider" Height="32" Margin="10 0 2 0" Minimum="0" Maximum="100" Foreground="{StaticResource TangoDarkForegroundBrush}" - IsSnapToTickEnabled="True" TickFrequency="1" AutoToolTipPlacement="BottomRight"/> + IsSnapToTickEnabled="True" TickFrequency="1"/> </Grid> </ControlTemplate> |