STY: Update macosx zoom rect styling

greglucas · greglucas · commit 24dd283e281e · 2022-11-04T13:37:32.000-06:00
Match the zoom box styling of the other backends with alternating
white/black paths.
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];
+        double 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] set];
+        [white_path stroke];
+        [[NSColor blackColor] set];
+        [black_path stroke];
     }
 
   exit:
@@ -1526,16 +1537,17 @@ - (void)otherMouseDragged:(NSEvent *)event { [self mouseDragged: event]; }
 
 - (void)setRubberband:(NSRect)rect
 {
-    if (!NSIsEmptyRect(rubberband)) { [self setNeedsDisplayInRect: rubberband]; }
     rubberband = rect;
-    [self setNeedsDisplayInRect: rubberband];
+    // We can't just set DisplayInRect because the outer paths need to be removed
+    // when shrinking the zoom-box inwards
+    [self setNeedsDisplay: YES];
 }
 
 - (void)removeRubberband
 {
     if (NSIsEmptyRect(rubberband)) { return; }
-    [self setNeedsDisplayInRect: rubberband];
     rubberband = NSZeroRect;
+    [self setNeedsDisplay: YES];
 }
 
 - (const char*)convertKeyEvent:(NSEvent*)event
