🐞 Fix multitouch gesture targeting and magnify gate

Author: mrkai77

Loop/Core/Multitouch/MultitouchRecognizerRegistry.swift

@@ -109,6 +109,7 @@ final class MultitouchRecognizerRegistry {
     ) {
         let recognizer = SubsurfaceGestureRecognizer(
             fingerCount: fingerCount,
+            recognizedGestureTypes: [.swipe, .magnify],
             requiresExactFingerCountToContinue: true
         )
 

Loop/Core/Multitouch/MultitouchTargetResolver.swift

@@ -15,9 +15,15 @@ final class MultitouchTargetResolver {
     /// Window most recently targeted by a repeatable gesture.
     /// Lets shrinking/growing continue after the cursor falls off the resized frame.
     private var lastRepeatableWindow: Window?
+    private var gestureWindowLookups: [GestureBinding.ActivationZone: WindowLookup] = [:]
 
     func reset() {
         lastRepeatableWindow = nil
+        resetGestureState()
+    }
+
+    func resetGestureState() {
+        gestureWindowLookups.removeAll()
     }
 
     func targetWindow(for gesture: GestureBinding, allowsRapidRepeat: Bool) -> Window? {
@@ -35,13 +41,19 @@ final class MultitouchTargetResolver {
 
     private func findTargetWindow(for gesture: GestureBinding) -> Window? {
         let cursorPosition = NSEvent.mouseLocation.flipY(screen: NSScreen.screens[0])
+        let activationZone: GestureBinding.ActivationZone = gesture.fingerCount <= 2 ? .titlebar : gesture.activationZone
+
+        if let windowLookup = gestureWindowLookups[activationZone] {
+            return windowLookup.window
+        }
 
         guard let window = WindowUtility.windowAtPosition(cursorPosition) else {
+            gestureWindowLookups[activationZone] = WindowLookup(window: nil)
             return nil
         }
 
         // 2-finger gestures are always titlebar-only to avoid system gesture conflicts.
-        switch gesture.fingerCount <= 2 ? .titlebar : gesture.activationZone {
+        switch activationZone {
         case .titlebar:
             let minimumTitlebarHeight = Defaults[.gestureTitlebarHeight]
             let titlebarHeight: CGFloat = if #available(macOS 26, *) {
@@ -60,10 +72,17 @@ final class MultitouchTargetResolver {
             let titlebarMinY = window.frame.minY
             let titlebarMaxY = window.frame.minY + titlebarHeight
             let isInTitlebar = cursorPosition.y >= titlebarMinY && cursorPosition.y <= titlebarMaxY
-            return isInTitlebar ? window : nil
+            let targetWindow = isInTitlebar ? window : nil
+            gestureWindowLookups[activationZone] = WindowLookup(window: targetWindow)
+            return targetWindow
 
         case .anywhere:
+            gestureWindowLookups[activationZone] = WindowLookup(window: window)
             return window
         }
     }
 }
+
+private struct WindowLookup {
+    let window: Window?
+}

Loop/Core/Multitouch/MultitouchTrigger.swift

@@ -36,7 +36,7 @@ final class MultitouchTrigger {
     private var isStarted = false
 
     let swipeCycleStepSize: CGFloat = 0.15
-    let magnifyStepSize: CGFloat = 0.3
+    let magnifyStepSize: CGFloat = 0.2
     let cardinalBiasedRadialMenuActionCount = 8
 
     var radialMenuActions = RadialMenuAction.userConfiguredActions
@@ -208,13 +208,14 @@ final class MultitouchTrigger {
         magnifyDisplacement: CGFloat? = nil
     ) async -> Bool {
         guard let session = recognizerRegistry.session(for: fingerCount), !session.isGestureRejected else { return false }
-        if session.hasActivated { return true }
 
         if let magnifyDisplacement,
            abs(magnifyDisplacement) < magnifyStepSize {
             return false
         }
 
+        if session.hasActivated { return true }
+
         var openedLoop = false
         if let window = session.pendingTargetWindow {
             do {
@@ -241,6 +242,7 @@ final class MultitouchTrigger {
 
         gestureBlocker.stop()
         recognizerRegistry.session(for: fingerCount)?.reset()
+        targetResolver.resetGestureState()
     }
 }