From 5a7097bfc7ac71f49ba812d5a81d4051ef1e84e2 Mon Sep 17 00:00:00 2001
From: Gabriel Selzer <gjselzer@wisc.edu>
Date: Wed, 30 Oct 2024 13:17:03 -0500
Subject: [PATCH] Switch grabbed clim on overlap

---
 src/ndv/histogram/_vispy.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/ndv/histogram/_vispy.py b/src/ndv/histogram/_vispy.py
index fa8aa92..5f2b97d 100644
--- a/src/ndv/histogram/_vispy.py
+++ b/src/ndv/histogram/_vispy.py
@@ -329,7 +329,7 @@ def __init__(self, parent: Any = None) -> None:
         self._gamma_handle_grabbed: bool = False
 
         self._clims: tuple[float, float] | None = None
-        self._clim_handle_grabbed: int = 0
+        self._clim_handle_grabbed: int = -1
         # The gamma handle appears halfway between the clims
 
         self.plot._view.add(self._hist)
@@ -463,17 +463,17 @@ def on_mouse_press(self, event: SceneMouseEvent) -> None:
         # determine if a clim_handle was clicked
         self._clim_handle_grabbed = self._pos_is_clim(event)
         self._gamma_handle_grabbed = self._pos_is_gamma(event)
-        if self._clim_handle_grabbed or self._gamma_handle_grabbed:
+        if self._clim_handle_grabbed > -1 or self._gamma_handle_grabbed:
             # disconnect the pan/zoom mouse events until handle is dropped
             self.plot.camera.interactive = False
 
     def on_mouse_release(self, event: SceneMouseEvent) -> None:
-        self._clim_handle_grabbed = 0
+        self._clim_handle_grabbed = -1
         self._gamma_handle_grabbed = False
         self.plot.camera.interactive = True
 
     def _pos_is_clim(self, event: SceneMouseEvent, tolerance: int = 3) -> int:
-        """Returns 1 if x is near clims[0], 2 if near clims[1], else 0
+        """Returns i if x is near clims[i], else -1
         event is expected to to have an attribute 'pos' giving the mouse
         position be in window coordinates.
         """
@@ -489,10 +489,10 @@ def _pos_is_clim(self, event: SceneMouseEvent, tolerance: int = 3) -> int:
             clim1, _ = self._to_window_coords((self._clims[1],))
             clim0, _ = self._to_window_coords((self._clims[0],))
         if abs(clim1 - x) < tolerance:
-            return 2
-        if abs(clim0 - x) < tolerance:
             return 1
-        return 0
+        if abs(clim0 - x) < tolerance:
+            return 0
+        return -1
 
     def _pos_is_gamma(self, event: SceneMouseEvent, tolerance: int = 4) -> bool:
         """Returns True if value is near the gamma handle.
@@ -516,13 +516,17 @@ def on_mouse_move(self, event: SceneMouseEvent) -> None:
 
         # event.pos == (0,0) is top left corner of window
 
-        if self._clim_handle_grabbed:
+        if self._clim_handle_grabbed > -1:
             newlims = list(self._clims)
             if self.vertical:
                 c = self._to_plot_coords(event.pos)[1]
             else:
                 c = self._to_plot_coords(event.pos)[0]
-            newlims[self._clim_handle_grabbed - 1] = c
+            newlims[self._clim_handle_grabbed] = c
+            if newlims[0] > newlims[1]:
+                newlims[:] = newlims[::-1]
+                self._clim_handle_grabbed += 1
+                self._clim_handle_grabbed %= 2
             self.climsChanged.emit(newlims)
             return
 
@@ -537,7 +541,7 @@ def on_mouse_move(self, event: SceneMouseEvent) -> None:
 
         self.native.unsetCursor()
 
-        if self._pos_is_clim(event):
+        if self._pos_is_clim(event) > -1:
             if self.vertical:
                 cursor = Qt.CursorShape.SplitVCursor
             else: