kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T56909: wrong interface scale on macOS 10.14, when using 10.14 SDK.

Browse Source 
This does not affect existing releases as far as I can tell, only new builds
using the new SDK have the problem.
This commit is contained in:
Brecht Van Lommel 2018-09-30 19:28:15 +02:00
parent d6ca699d7e
commit 786870e26f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
intern/ghost/intern/GHOST_WindowCocoa.mm
View File

@ -551,7 +551,15 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(
//Creates the OpenGL View inside the window //Creates the OpenGL View inside the window
m_openGLView = [[CocoaOpenGLView alloc] initWithFrame:rect]; m_openGLView = [[CocoaOpenGLView alloc] initWithFrame:rect];
if (m_systemCocoa->m_nativePixel) {
// Needs to happen early when building with the 10.14 SDK, otherwise
// has no effect until resizeing the window.
if ([m_openGLView respondsToSelector:@selector(setWantsBestResolutionOpenGLSurface:)]) {
[m_openGLView setWantsBestResolutionOpenGLSurface:YES];
}
}
[m_openGLView setSystemAndWindowCocoa:systemCocoa windowCocoa:this]; [m_openGLView setSystemAndWindowCocoa:systemCocoa windowCocoa:this];
[m_window setContentView:m_openGLView]; [m_window setContentView:m_openGLView];
@ -563,14 +571,9 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(
updateDrawingContext(); updateDrawingContext();
activateDrawingContext(); activateDrawingContext();
// XXX jwilkins: This seems like it belongs in GHOST_ContextCGL, but probably not GHOST_ContextEGL
if (m_systemCocoa->m_nativePixel) { if (m_systemCocoa->m_nativePixel) {
if ([m_openGLView respondsToSelector:@selector(setWantsBestResolutionOpenGLSurface:)]) { NSRect backingBounds = [m_openGLView convertRectToBacking:[m_openGLView bounds]];
[m_openGLView setWantsBestResolutionOpenGLSurface:YES]; m_nativePixelSize = (float)backingBounds.size.width / (float)rect.size.width;
NSRect backingBounds = [m_openGLView convertRectToBacking:[m_openGLView bounds]];
m_nativePixelSize = (float)backingBounds.size.width / (float)rect.size.width;
}
} }
setTitle(title); setTitle(title);