Update _toolTip even if toolTipText isn't available

This allows adding custom content to the tooltip
CommunityToolkit · Sep 5, 2024 · 52755d7 · 52755d7
1 parent 1418ca9
commit 52755d7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/components/RangeSelector/src/RangeSelector.Input.Drag.cs b/components/RangeSelector/src/RangeSelector.Input.Drag.cs
@@ -77,7 +77,7 @@ private double DragThumb(Thumb? thumb, double min, double max, double nextPos)
 
         Canvas.SetLeft(thumb, nextPos);
 
-        if (_toolTipText != null && _toolTip != null && thumb != null)
+        if (_toolTip != null && thumb != null)
         {
             var thumbCenter = nextPos + (thumb.Width / 2);
             _toolTip.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
@@ -99,15 +99,16 @@ private void Thumb_DragStarted(Thumb thumb)
         Canvas.SetZIndex(otherThumb, 0);
         _oldValue = RangeStart;
 
-        if (_toolTipText != null && _toolTip != null)
+        if (_toolTip != null)
         {
             _toolTip.Visibility = Visibility.Visible;
             var thumbCenter = _absolutePosition + (thumb.Width / 2);
             _toolTip.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
             var ttWidth = _toolTip.ActualWidth / 2;
             Canvas.SetLeft(_toolTip, thumbCenter - ttWidth);
 
-            UpdateToolTipText(this, _toolTipText, useMin ? RangeStart : RangeEnd);
+            if (_toolTipText != null)
+                UpdateToolTipText(this, _toolTipText, useMin ? RangeStart : RangeEnd);
         }
 
         VisualStateManager.GoToState(this, useMin ? MinPressedState : MaxPressedState, true);