From 3409bcbb5e15dabc94fde4521f5b079620c72254 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Mon, 29 Oct 2018 17:17:43 +0000 Subject: [PATCH] Fix moving GL subwindow between retina and non-retina screens. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@13095 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_cocoa.mm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 451b421fa..821a0c6e8 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -1444,9 +1444,8 @@ static FLWindowDelegate *flwindowdelegate_instance = nil; if (!window->as_gl_window()) { // move layered non-GL window to different resolution [(FLView*)[nsw contentView] viewFrameDidChange]; } - if (window->parent()) { - [nsw setSubwindowFrame]; - [[nsw contentView] display]; + if (fl_mac_os_version < 101401 && window->parent() && window->as_gl_window() && Fl::use_high_res_GL()) { + [[nsw contentView] layer].contentsScale = Fl_X::i(window)->mapped_to_retina() ? 2. : 1.; } } #endif