[Skim-app-commit] SF.net SVN: skim-app:[14444] trunk/NSData_SKExtensi ons.m

[hofman--- via Skim-app-commit]

Revision: 14444
          http://sourceforge.net/p/skim-app/code/14444
Author:   hofman
Date:     2024-09-01 17:26:09 +0000 (Sun, 01 Sep 2024)
Log Message:
-----------
Return QD Point data for scripting whn point coordinates are integral

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

Modified: trunk/NSData_SKExtensions.m
===================================================================
--- trunk/NSData_SKExtensions.m 2024-09-01 09:07:01 UTC (rev 14443)
+++ trunk/NSData_SKExtensions.m 2024-09-01 17:26:09 UTC (rev 14444)
@@ -186,6 +186,8 @@
 }
 
 + (NSData *)dataWithPointAsNSPoint:(NSPoint)point {
+    if (floor(point.x) >= point.x && floor(point.y) >= point.y)
+        return [self dataWithPointAsQDPoint:point];
     return [self dataWithBytes:&point length:sizeof(NSPoint)];
 }
 
@@ -256,15 +258,19 @@
 }
 
 - (NSAppleEventDescriptor *)scriptingRealPointDescriptor {
-    NSPoint point = [self pointValueAsNSPoint];
     NSAppleEventDescriptor *descriptor;
-    if (floor(point.x) >= point.x && floor(point.y) >= point.y) {
-        Point qdPoint = SKQDPointFromNSPoint(point);
-        descriptor = [NSAppleEventDescriptor 
descriptorWithDescriptorType:typeQDPoint bytes:&qdPoint length:sizeof(Point)];
+    if ([self length] == sizeof(Point)) {
+        descriptor = [NSAppleEventDescriptor 
descriptorWithDescriptorType:typeQDPoint data:self];
     } else {
-        descriptor = [NSAppleEventDescriptor listDescriptor];
-        [descriptor insertDescriptor:[NSAppleEventDescriptor 
descriptorWithDouble:point.x] atIndex:1];
-        [descriptor insertDescriptor:[NSAppleEventDescriptor 
descriptorWithDouble:point.y] atIndex:2];
+        NSPoint point = [self pointValueAsNSPoint];
+        if (floor(point.x) >= point.x && floor(point.y) >= point.y) {
+            Point qdPoint = SKQDPointFromNSPoint(point);
+            descriptor = [NSAppleEventDescriptor 
descriptorWithDescriptorType:typeQDPoint bytes:&qdPoint length:sizeof(Point)];
+        } else {
+            descriptor = [NSAppleEventDescriptor listDescriptor];
+            [descriptor insertDescriptor:[NSAppleEventDescriptor 
descriptorWithDouble:point.x] atIndex:1];
+            [descriptor insertDescriptor:[NSAppleEventDescriptor 
descriptorWithDouble:point.y] atIndex:2];
+        }
     }
     return descriptor;
 }

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



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit