diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 08:16:52 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 08:16:52 +0000 |
commit | db0da4c882437f3b76a34308edeaa2c41d8c2833 (patch) | |
tree | 7f4486279e1f9819d406f1425cab495d5852bf81 /libgimpwidgets | |
parent | Releasing progress-linux version 2.10.36-3~progress7.99u1. (diff) | |
download | gimp-db0da4c882437f3b76a34308edeaa2c41d8c2833.tar.xz gimp-db0da4c882437f3b76a34308edeaa2c41d8c2833.zip |
Merging upstream version 2.10.38.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | libgimpwidgets/gimppickbutton-quartz.c | 9 |
1 files changed, 8 insertions, 1 deletions
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); |