From c00f31ab10bcf26ecf6c4573be6df396d3df3b07 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Mon, 6 May 2019 16:55:41 +0200 Subject: Slightly simpler code for what is specific to macOS 10.14.0 --- src/Fl_cocoa.mm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 6e5f496de..7e255cd90 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -2181,19 +2181,16 @@ static FLTextInputContext* fltextinputcontext_instance = nil; } - (void)drawRect:(NSRect)rect { //runs when layer-backed GL window is created or resized fl_lock_function(); - if (!Fl::use_high_res_GL() && fl_mac_os_version < 101401) [self layer].contentsScale = 1.; Fl_Window *window = [(FLWindow*)[self window] getFl_Window]; Fl_Cocoa_Window_Driver *d = Fl_Cocoa_Window_Driver::driver(window); [self did_view_resolution_change]; if (d->wait_for_expose_value) { // 1st drawing of layer-backed GL window d->wait_for_expose_value = 0; + if (fl_mac_os_version < 101401) window->size(window->w(), window->h()); // sends message [GLcontext update] } window->clear_damage(FL_DAMAGE_ALL); d->Fl_Window_Driver::flush(); window->clear_damage(); - if (fl_mac_os_version < 101401) { - if (window->parent()) window->redraw(); // useful during resize of GL subwindow - } fl_unlock_function(); } - (BOOL)did_view_resolution_change { -- cgit v1.2.3