Merge pull request #24367 from greglucas/macosx-zoom-box-style

tacaswell · web-flow · commit e0d65b697ac3 · 2022-12-12T19:00:29.000-05:00
STY: Update macosx zoom rect styling
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -1330,7 +1330,18 @@ -(void)drawRect:(NSRect)rect
         goto exit;
     }
     if (!NSIsEmptyRect(rubberband)) {
-        NSFrameRect(rubberband);
+        // We use bezier paths so we can stroke the outside with a dash
+        // pattern alternating white/black with two separate paths offset
+        // in phase.
+        NSBezierPath *white_path = [NSBezierPath bezierPathWithRect: rubberband];
+        NSBezierPath *black_path = [NSBezierPath bezierPathWithRect: rubberband];
+        CGFloat dash_pattern[2] = {3, 3};
+        [white_path setLineDash: dash_pattern count: 2 phase: 0];
+        [black_path setLineDash: dash_pattern count: 2 phase: 3];
+        [[NSColor whiteColor] setStroke];
+        [white_path stroke];
+        [[NSColor blackColor] setStroke];
+        [black_path stroke];
     }
 
   exit:
@@ -1526,9 +1537,11 @@ - (void)otherMouseDragged:(NSEvent *)event { [self mouseDragged: event]; }
 
 - (void)setRubberband:(NSRect)rect
 {
-    if (!NSIsEmptyRect(rubberband)) { [self setNeedsDisplayInRect: rubberband]; }
+    // The space we want to redraw is a union of the previous rubberband
+    // with the new rubberband and then expanded (negative inset) by one
+    // in each direction to account for the stroke linewidth.
+    [self setNeedsDisplayInRect: NSInsetRect(NSUnionRect(rect, rubberband), -1, -1)];
     rubberband = rect;
-    [self setNeedsDisplayInRect: rubberband];
 }
 
 - (void)removeRubberband
