mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support running under MacOS 10.14 with SDK 10.14 and 32-bit architecture.

Browse Source
This commit is contained in:
Manolo Gouy 2019-01-09 15:25:29 +01:00
parent 0a98405424
commit 294105d8d7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Fl_Copy_Surface.cxx
View File

@ -244,7 +244,7 @@ void Fl_Copy_Surface::draw_decorated_window(Fl_Window* win, int delta_x, int del
} else {
CGImageRef img = Fl_X::CGImage_from_window_rect(win, 0, -bt, win->w(), bt);
CGContextDrawImage(gc, CGRectMake(0, 0, win->w(), bt), img);
CFRelease(img);
CGImageRelease(img);
}
CGContextRestoreGState(gc);
}

2
src/Fl_Image_Surface.cxx
View File

@ -215,7 +215,7 @@ void Fl_Image_Surface::draw_decorated_window(Fl_Window* win, int delta_x, int de
} else {
CGImageRef img = Fl_X::CGImage_from_window_rect(win, 0, -bt, win->w(), bt);
CGContextDrawImage(fl_gc, CGRectMake(0, 0, win->w(), bt), img);
CFRelease(img);
CGImageRelease(img);
}
helper->untranslate();
CGContextTranslateCTM(fl_gc, delta_x, height+delta_y);

2
src/Fl_cocoa.mm
View File

@ -4492,7 +4492,7 @@ static NSBitmapImageRep* rect_to_NSBitmapImageRep_layer(Fl_Window *win, int x, i
NSBitmapImageRep *bitmap = nil;
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
CGContextRef gc = ((FLViewLayer*)[fl_xid(win) contentView])->layer_data;
if (!gc) return nil;
if (!gc || y < 0) return nil;
CGImageRef cgimg = CGBitmapContextCreateImage(gc); // requires 10.4
Fl_X *i = Fl_X::i( win );
int resolution = i->mapped_to_retina() ? 2 : 1;