fix(library): stabilize shelf rendering and dragging

Author: ReKylee

src/ui/Ui.cpp

@@ -174,8 +174,16 @@ namespace ui {
         case TouchSampleResult::None:
             return false;
         case TouchSampleResult::Reset:
-            resetTouchGesture();
-            return false;
+            if (!touchActive_) {
+                resetTouchGesture();
+                return false;
+            }
+            touchActive_ = false;
+            touchHoldEmitted_ = false;
+            touchOutsideSamples_ = 0;
+            touchStartedAtMs_ = 0;
+            touchEvent_ = {TouchRelease, touchLastX_, touchLastY_};
+            return touchPending_ = true;
         case TouchSampleResult::Contact:
             break;
         }

src/ui/Ui.h

@@ -3,6 +3,7 @@
 #include <Arduino.h>
 #include <Arduino_GFX_Library.h>
 
+#include <algorithm>
 #include <array>
 #include <cstdint>
 #include <expected>
@@ -35,6 +36,14 @@ namespace ui {
         return x >= rect.x && y >= rect.y && x < rect.x + rect.w && y < rect.y + rect.h;
     }
 
+    constexpr Rect intersection(Rect left, Rect right) {
+        const int16_t x = std::max(left.x, right.x);
+        const int16_t y = std::max(left.y, right.y);
+        const int x2 = std::min<int>(left.x + left.w, right.x + right.w);
+        const int y2 = std::min<int>(left.y + left.h, right.y + right.h);
+        return {x, y, static_cast<int16_t>(std::max(0, x2 - x)), static_cast<int16_t>(std::max(0, y2 - y))};
+    }
+
     constexpr Rect rotateClockwise(Rect rect, int16_t sourceWidth) {
         return {rect.y, static_cast<int16_t>(sourceWidth - rect.x - rect.w), rect.h, rect.w};
     }