From 839c46e19ac4aa00b619a185ad48ee977162ef2c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 8 May 2024 10:16:47 +0200 Subject: Merging upstream version 2.10.38. Signed-off-by: Daniel Baumann --- libgimpwidgets/gimppickbutton-quartz.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'libgimpwidgets/gimppickbutton-quartz.c') diff --git a/libgimpwidgets/gimppickbutton-quartz.c b/libgimpwidgets/gimppickbutton-quartz.c index 5d581d3..af64e84 100644 --- a/libgimpwidgets/gimppickbutton-quartz.c +++ b/libgimpwidgets/gimppickbutton-quartz.c @@ -59,6 +59,10 @@ { GimpPickButton *button; NSMutableArray *windows; +#ifndef __LP64__ + BOOL firstBecameKey; + NSCursor *cursor; +#endif } @property (nonatomic, assign) BOOL firstBecameKey; @@ -73,6 +77,9 @@ { GimpPickButton *button; GimpPickWindowController *controller; +#ifndef __LP64__ + NSTrackingArea *area; +#endif } @property (readonly,assign) NSTrackingArea *area; @@ -197,7 +204,7 @@ rect = [self.window convertRectToScreen:rect]; rect.origin.y = [[[NSScreen screens] objectAtIndex:0] frame].size.height - rect.origin.y; - root_image_ref = CGWindowListCreateImage (rect, + root_image_ref = CGWindowListCreateImage (NSRectToCGRect(rect), kCGWindowListOptionOnScreenOnly, kCGNullWindowID, kCGWindowImageDefault); -- cgit v1.2.3