Don't change handle color on grab.

ianhi · ianhi · commit cc44f7dac837 · 2021-01-10T11:36:34.000-05:00
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -330,9 +330,8 @@ def __init__(self, ax, label, valmin, valmax, valinit=0.5, valfmt=None,
                  closedmin=True, closedmax=True, slidermin=None,
                  slidermax=None, dragging=True, valstep=None,
                  orientation='horizontal', *, initcolor='r',
-                 track_color='lightgrey', handle_color_grabbed=None,
-                 handle_color_released='white', handle_edgecolor='.75',
-                 handle_size=10, **kwargs):
+                 track_color='lightgrey', handle_facecolor='white',
+                 handle_edgecolor='.75', handle_size=10, **kwargs):
         """
         Parameters
         ----------
@@ -387,12 +386,8 @@ def __init__(self, ax, label, valmin, valmax, valinit=0.5, valfmt=None,
             The color of the backgrond track. The track is accesible for
             further styling via the *track* attribute.
 
-        handle_color_grabbed : color or None, default: None
-            The color of the circular slider handle when grabbed. If *None*
-            the same color as active part of the slider will be used.
-
-        handle_color_released : color, default: 'white'
-            The color of the circular slider handle when released.
+        handle_facecolor : color, default: 'white'
+            The facecolor of the circular slider handle.
 
         handle_edgecolor : color, default: '.75'
             The edgecolor of the circle slider handle.
@@ -448,16 +443,10 @@ def __init__(self, ax, label, valmin, valmax, valinit=0.5, valfmt=None,
             "o",
             markersize=handle_size,
             markeredgecolor=handle_edgecolor,
-            markerfacecolor=handle_color_released,
+            markerfacecolor=handle_facecolor,
             clip_on=False
         )
 
-        self._handle_color_released = handle_color_released
-        self._handle_edgecolor = handle_edgecolor
-        if handle_color_grabbed is None:
-            handle_color_grabbed = self.poly.get_facecolor()
-        self._handle_color_grabbed = handle_color_grabbed
-
         if orientation == 'vertical':
             self.label = ax.text(0.5, 1.02, label, transform=ax.transAxes,
                                  verticalalignment='bottom',
@@ -520,13 +509,7 @@ def _update(self, event):
                event.inaxes != self.ax)):
             self.drag_active = False
             event.canvas.release_mouse(self.ax)
-            self._handle.set_markeredgecolor(self._handle_edgecolor)
-            self._handle.set_markerfacecolor(self._handle_color_released)
-            self.ax.figure.canvas.draw_idle()
             return
-        if event.name == 'button_press_event':
-            self._handle.set_markeredgecolor(self._handle_color_grabbed)
-            self._handle.set_markerfacecolor(self._handle_color_grabbed)
         if self.orientation == 'vertical':
             val = self._value_in_bounds(event.ydata)
         else:
@@ -615,8 +598,7 @@ def __init__(
         valstep=None,
         orientation="horizontal",
         track_color='lightgrey',
-        handle_color_grabbed=None,
-        handle_color_released='white',
+        handle_facecolor='white',
         handle_edgecolor='.75',
         handle_size=10,
         **kwargs,
@@ -667,8 +649,8 @@ def __init__(
             The color of the circular slider handles when grabbed. If *None*
             the same color as active part of the slider will be used.
 
-        handle_color_released : color, default: 'white'
-            The color of the circular slider handles when released.
+        handle_facecolor : color, default: 'white'
+            The facecolor of the circular slider handle.
 
         handle_edgecolor : color, default: '.75'
             The edgecolor of the circular slider handles.
@@ -722,25 +704,19 @@ def __init__(
                 "o",
                 markersize=handle_size,
                 markeredgecolor=handle_edgecolor,
-                markerfacecolor=handle_color_released,
+                markerfacecolor=handle_facecolor,
                 clip_on=False
             )[0],
             ax.plot(
                 *handleXY_2,
                 "o",
                 markersize=handle_size,
                 markeredgecolor=handle_edgecolor,
-                markerfacecolor=handle_color_released,
+                markerfacecolor=handle_facecolor,
                 clip_on=False
             )[0]
         ]
 
-        self._handle_color_released = handle_color_released
-        self._handle_edgecolor = handle_edgecolor
-        if handle_color_grabbed is None:
-            handle_color_grabbed = self.poly.get_facecolor()
-        self._handle_color_grabbed = handle_color_grabbed
-
         if orientation == "vertical":
             self.label = ax.text(
                 0.5,
@@ -835,10 +811,6 @@ def _update(self, event):
         ):
             self.drag_active = False
             event.canvas.release_mouse(self.ax)
-            self.ax.figure.canvas.draw_idle()
-            for handle in self._handles:
-                handle.set_markeredgecolor(self._handle_edgecolor)
-                handle.set_markerfacecolor(self._handle_color_released)
             self._active_handle = None
             return
 
@@ -851,16 +823,7 @@ def _update(self, event):
         # these checks ensure smooth behavior if the handles swap which one
         # has a higher value. i.e. if one is dragged over and past the other.
         if handle is not self._active_handle:
-            if self._active_handle is not None:
-                self._active_handle.set_markeredgecolor(
-                    self._handle_edgecolor
-                )
-                self._active_handle.set_markerfacecolor(
-                    self._handle_color_released
-                )
             self._active_handle = handle
-        self._active_handle.set_markeredgecolor(self._handle_color_grabbed)
-        self._active_handle.set_markerfacecolor(self._handle_color_grabbed)
 
         if self.orientation == "vertical":
             self._update_val_from_pos(event.ydata)
