hs.image:colorAt() now takes into account scale

- Closes #3184
Hammerspoon · Apr 11, 2022 · bd9870a · bd9870a
1 parent 6eda506
commit bd9870a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/extensions/image/libimage.m b/extensions/image/libimage.m
@@ -1304,7 +1304,7 @@ static int getImageSize(lua_State* L) {
 ///  * A `hs.drawing.color` object
 static int colorAt(lua_State* L) {
     LuaSkin *skin = [LuaSkin sharedWithState:L] ;
-    [skin checkArgs:LS_TUSERDATA, USERDATA_TAG, LS_TTABLE, LS_TBREAK] ;
+    [skin checkArgs:LS_TUSERDATA, USERDATA_TAG, LS_TTABLE, LS_TBREAK];
 
     NSImage *theImage = [skin luaObjectAtIndex:1 toClass:"NSImage"] ;
     NSPoint point  = [skin tableToPointAtIndex:2] ;
@@ -1313,9 +1313,13 @@ static int colorAt(lua_State* L) {
     @autoreleasepool {
         CGImageRef CGImage = [theImage CGImageForProposedRect:nil context:nil hints:nil];
         NSBitmapImageRep *rep = [[NSBitmapImageRep alloc] initWithCGImage:CGImage];
-        pixelColor = [rep colorAtX:point.x y:point.y];
+        NSSize imageSize = [theImage size];
+        NSSize bitmapSize = [rep size];
+        CGFloat xScale = bitmapSize.width / imageSize.width;
+        CGFloat yScale = bitmapSize.height / imageSize.height;
+        pixelColor = [rep colorAtX:(point.x * xScale) y:(point.y * yScale)];
     }
-
+    
     [skin pushNSObject:pixelColor];
 
     return 1;