summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2018-10-29 17:09:37 +0000
committerManolo Gouy <Manolo>2018-10-29 17:09:37 +0000
commit71d7a9db79044d7aa479c136248f75542188e6f5 (patch)
treebbf6f6b9ad9ac3d9f21479a07aba393cad001852
parentac60de1a923919f1d277a5e691b521c08d98be59 (diff)
Fix handling of layer-backed sub GL window moved between retina and non-retina screens.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@13093 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--src/Fl_cocoa.mm6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index e1f5d44be..b0d7c4ccc 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -1255,9 +1255,9 @@ 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()) {
+ Fl_Cocoa_Window_Driver *d = Fl_Cocoa_Window_Driver::driver(window);
+ [[nsw contentView] layer].contentsScale = d->mapped_to_retina() ? 2. : 1.;
}
}
#endif