Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-01 23:06:54 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

macOS platform: facilitate use when another toolkit handles the system menu.

Browse Source
This commit is contained in:
ManoloFLTK
2021-09-24 17:56:23 +02:00
parent c3857517b0
commit 0f12e96d13
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_cocoa.mm
+7 -3
View File
@@ -1716,6 +1716,7 @@ void Fl_Cocoa_Screen_Driver::open_display_platform() {
if (![NSApp isActive]) foreground_and_activate(); if (![NSApp isActive]) foreground_and_activate();
if (![NSApp servicesMenu]) createAppleMenu(); if (![NSApp servicesMenu]) createAppleMenu();
else Fl_Sys_Menu_Bar::window_menu_style(Fl_Sys_Menu_Bar::no_window_menu);
main_screen_height = CGDisplayBounds(CGMainDisplayID()).size.height; main_screen_height = CGDisplayBounds(CGMainDisplayID()).size.height;
[[NSNotificationCenter defaultCenter] addObserver:[FLWindowDelegate singleInstance] [[NSNotificationCenter defaultCenter] addObserver:[FLWindowDelegate singleInstance]
selector:@selector(anyWindowWillClose:) selector:@selector(anyWindowWillClose:)
@@ -3459,11 +3460,14 @@ static NSBitmapImageRep *pdf_to_nsbitmapimagerep(NSData *pdfdata) {
hasAlpha:YES hasAlpha:YES
isPlanar:NO isPlanar:NO
colorSpaceName:NSDeviceRGBColorSpace colorSpaceName:NSDeviceRGBColorSpace
bytesPerRow:4 * width bytesPerRow:0
bitsPerPixel:32]; bitsPerPixel:0];
NSAutoreleasePool *localPool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *localPool = [[NSAutoreleasePool alloc] init];
[NSGraphicsContext saveGraphicsState]; [NSGraphicsContext saveGraphicsState];
[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]];// 10.4 [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]];// 10.4
[[NSColor clearColor] set];
NSRect r = NSMakeRect(0, 0, width, height);
NSRectFill(r);
[image drawInRect:dest_r]; // 10.9 [image drawInRect:dest_r]; // 10.9
[NSGraphicsContext restoreGraphicsState]; [NSGraphicsContext restoreGraphicsState];
[localPool release]; [localPool release];
@@ -3611,7 +3615,7 @@ static Fl_RGB_Image* get_image_from_clipboard(Fl_Widget *receiver)
{ {
NSPasteboard *clip = [NSPasteboard generalPasteboard]; NSPasteboard *clip = [NSPasteboard generalPasteboard];
NSArray *present = [clip types]; // types in pasteboard in order of decreasing preference NSArray *present = [clip types]; // types in pasteboard in order of decreasing preference
NSArray *possible = [NSArray arrayWithObjects:TIFF_pasteboard_type, PDF_pasteboard_type, PICT_pasteboard_type, nil]; NSArray *possible = [NSArray arrayWithObjects:PDF_pasteboard_type, TIFF_pasteboard_type, PICT_pasteboard_type, nil];
NSString *found = nil; NSString *found = nil;
NSUInteger rank; NSUInteger rank;
for (NSUInteger i = 0; (!found) && i < [possible count]; i++) { for (NSUInteger i = 0; (!found) && i < [possible count]; i++) {