Revision: 14415
          http://sourceforge.net/p/skim-app/code/14415
Author:   hofman
Date:     2024-08-03 22:04:02 +0000 (Sat, 03 Aug 2024)
Log Message:
-----------
redraw snapshot tool icons to math camera cursor

Modified Paths:
--------------
    trunk/NSImage_SKExtensions.m

Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m        2024-08-03 16:33:51 UTC (rev 14414)
+++ trunk/NSImage_SKExtensions.m        2024-08-03 22:04:02 UTC (rev 14415)
@@ -832,17 +832,21 @@
     
     MAKE_IMAGE(SKImageNameToolbarSnapshotTool, YES, 27.0, 19.0,
         [[NSColor blackColor] set];
-        NSBezierPath *path = [NSBezierPath bezierPathWithRect:NSMakeRect(6.0, 
4.0, 15.0, 10.0)];
-        [path appendBezierPathWithOvalInRect:NSMakeRect(10.5, 10.0, 6.0, 6.0)];
-        [path fill];
-        [NSGraphicsContext saveGraphicsState];
-        [[NSGraphicsContext currentContext] 
setCompositingOperation:NSCompositingOperationClear];
-        [[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(9.8, 5.8, 7.4, 
7.4)] stroke];
-        path = [NSBezierPath bezierPath];
-        [path appendBezierPathWithArcWithCenter:NSMakePoint(13.5, 9.5) 
radius:1.8 startAngle:45.0 endAngle:225.0];
+        NSBezierPath *path = [NSBezierPath bezierPath];
+        [path moveToPoint:NSMakePoint(18.0, 13.0)];
+        [path appendBezierPathWithArcFromPoint:NSMakePoint(16.5, 13.0) 
toPoint:NSMakePoint(16.0, 11.0) radius:1.5];
+        [path appendBezierPathWithArcFromPoint:NSMakePoint(15.5, 15.0) 
toPoint:NSMakePoint(10.0, 15.0) radius:1.5];
+        [path appendBezierPathWithArcFromPoint:NSMakePoint(10.5, 15.0) 
toPoint:NSMakePoint(10.0, 14.0) radius:1.5];
+        [path appendBezierPathWithArcFromPoint:NSMakePoint(9.5, 13.0) 
toPoint:NSMakePoint(8.0, 13.0) radius:1.5];
+        [path appendBezierPathWithArcFromPoint:NSMakePoint(6.0, 13.0) 
toPoint:NSMakePoint(6.0, 11.0) radius:2.0];
+        [path appendBezierPathWithArcFromPoint:NSMakePoint(6.0, 5.0) 
toPoint:NSMakePoint(8.0, 5.0) radius:2.0];
+        [path appendBezierPathWithArcFromPoint:NSMakePoint(20.0, 5.0) 
toPoint:NSMakePoint(20.0, 7.0) radius:2.0];
+        [path appendBezierPathWithArcFromPoint:NSMakePoint(20.0, 13.0) 
toPoint:NSMakePoint(18.0, 13.0) radius:2.0];
         [path closePath];
+        [path appendBezierPathWithOvalInRect:NSMakeRect(10.0, 7.0, 6.0, 6.0)];
+        [path appendBezierPathWithOvalInRect:NSMakeRect(11.5, 8.5, 3.0, 3.0)];
+        [path setWindingRule:NSEvenOddWindingRule];
         [path fill];
-        [NSGraphicsContext restoreGraphicsState];
     );
     
     MAKE_IMAGE(SKImageNameToolbarShare, YES, 27.0, 19.0,
@@ -1240,19 +1244,22 @@
     );
     
     MAKE_IMAGE(SKImageNameTouchBarSnapshotTool, YES, 26.0, 30.0,
-        translate(-0.5, 5.5);
-        [[NSColor blackColor] setStroke];
-        NSBezierPath *path = [NSBezierPath bezierPathWithRect:NSMakeRect(6.0, 
4.0, 15.0, 10.0)];
-        [path appendBezierPathWithOvalInRect:NSMakeRect(10.5, 10.0, 6.0, 6.0)];
-        [path fill];
-        [NSGraphicsContext saveGraphicsState];
-        [[NSGraphicsContext currentContext] 
setCompositingOperation:NSCompositingOperationClear];
-        [[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(9.8, 5.8, 7.4, 
7.4)] stroke];
-        path = [NSBezierPath bezierPath];
-        [path appendBezierPathWithArcWithCenter:NSMakePoint(13.5, 9.5) 
radius:1.8 startAngle:45.0 endAngle:225.0];
+        translate(0.0, 5.5);
+        NSBezierPath *path = [NSBezierPath bezierPath];
+        [path moveToPoint:NSMakePoint(18.0, 13.0)];
+        [path appendBezierPathWithArcFromPoint:NSMakePoint(16.5, 13.0) 
toPoint:NSMakePoint(16.0, 11.0) radius:1.5];
+        [path appendBezierPathWithArcFromPoint:NSMakePoint(15.5, 15.0) 
toPoint:NSMakePoint(10.0, 15.0) radius:1.5];
+        [path appendBezierPathWithArcFromPoint:NSMakePoint(10.5, 15.0) 
toPoint:NSMakePoint(10.0, 14.0) radius:1.5];
+        [path appendBezierPathWithArcFromPoint:NSMakePoint(9.5, 13.0) 
toPoint:NSMakePoint(8.0, 13.0) radius:1.5];
+        [path appendBezierPathWithArcFromPoint:NSMakePoint(6.0, 13.0) 
toPoint:NSMakePoint(6.0, 11.0) radius:2.0];
+        [path appendBezierPathWithArcFromPoint:NSMakePoint(6.0, 5.0) 
toPoint:NSMakePoint(8.0, 5.0) radius:2.0];
+        [path appendBezierPathWithArcFromPoint:NSMakePoint(20.0, 5.0) 
toPoint:NSMakePoint(20.0, 7.0) radius:2.0];
+        [path appendBezierPathWithArcFromPoint:NSMakePoint(20.0, 13.0) 
toPoint:NSMakePoint(18.0, 13.0) radius:2.0];
         [path closePath];
+        [path appendBezierPathWithOvalInRect:NSMakeRect(10.0, 7.0, 6.0, 6.0)];
+        [path appendBezierPathWithOvalInRect:NSMakeRect(11.5, 8.5, 3.0, 3.0)];
+        [path setWindingRule:NSEvenOddWindingRule];
         [path fill];
-        [NSGraphicsContext restoreGraphicsState];
     );
     
     MAKE_IMAGE(SKImageNameTouchBarNewSeparator, YES, 28.0, 30.0,

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to