From 30efed7fd4d2dbbfabc7e7e3451e229b338dedca Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Mon, 3 Oct 2022 10:21:39 +0200 Subject: Revert 75016cb because it doesn't work well with macOS < 13.0 The problem is visible with test/tile when moving the sub window's border. This also fixes issue #508 --- src/Fl_cocoa.mm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/Fl_cocoa.mm') diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index beaba84db..8183f835a 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -505,9 +505,8 @@ void Fl_Cocoa_Screen_Driver::breakMacEventLoop() BOOL need_handle; // YES means Fl::handle(FL_KEYBOARD,) is needed after handleEvent processing NSInteger identifier; NSRange selectedRange; -@public - BOOL is_opaque; #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_14 +@public CGContextRef aux_bitmap; // all drawing to view goes there and is finally copied to the CALayer #endif } @@ -688,11 +687,9 @@ void Fl_Cocoa_Screen_Driver::breakMacEventLoop() FLView *view = (FLView*)[xid contentView]; if (CGRectEqualToRect(srect, full)) { r = NULL; - view->is_opaque = (w->shape() == NULL); } else { r = new CGRect(srect); if (r->size.width == 0 && r->size.height == 0) r->origin.x = r->origin.y = 0; - view->is_opaque = NO; } d->subRect(r); w->redraw(); @@ -2203,9 +2200,6 @@ static FLTextInputContext* fltextinputcontext_instance = nil; */ @implementation FLView -- (BOOL)isOpaque { - return is_opaque; -} - (BOOL)did_view_resolution_change { #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 if (fl_mac_os_version >= 100700) { // determine whether window is mapped to a retina display @@ -3001,7 +2995,6 @@ Fl_X* Fl_Cocoa_Window_Driver::makeWindow() [cw setContentView:myview]; [myview release]; [cw setLevel:winlevel]; - myview->is_opaque = (w->shape() == NULL); q_set_window_title(cw, w->label(), w->iconlabel()); NSImage *icon = icon_image; // is a window or default icon present? -- cgit v1.2.3