TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 15:53:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: fix compilation issues with new NSCursor hotspot code

Browse Source 
See #849
This commit is contained in:
rdb 2020-01-22 09:43:21 +01:00
parent 6f17a9e36a
commit b573cc3587
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
panda/src/cocoadisplay/cocoaGraphicsWindow.mm
View File

@ -1421,17 +1421,17 @@ load_cursor(const Filename &filename) {
CGFloat hotspot_x = 0.0f;
CGFloat hotspot_y = 0.0f;
if (image_props[@"hotspotX"] != nil) {
hotspot_x = [(NSNumber *)image_props[@"hotspotX"] floatValue];
if (NSNumber *number = [image_props objectForKey:@"hotspotX"]) {
hotspot_x = [number floatValue];
}
if (image_props[@"hotspotY"] != nil) {
hotspot_y = [(NSNumber *)image_props[@"hotspotY"] floatValue];
if (NSNumber *number = [image_props objectForKey:@"hotspotY"]) {
hotspot_y = [number floatValue];
}
[image_props release];
NSImage *image = [[NSImage alloc] initWithData:image_data];
NSCursor *cursor;
NSCursor *cursor = nil;
if (image != nil) {
// Apple recognizes that hotspots are usually specified from a .cur
// file, whose origin is in the top-left, so there's no need to flip