winemac: Defer attaching OpenGL context to a view which is zero-sized or outside…

winemac: Defer attaching OpenGL context to a view which is zero-sized or outside its window's bounds. That fails with the dread "invalid drawable" message.

winemac: Defer attaching OpenGL context to a view which is zero-sized or outside…
682ed910 · Ken Thomases · Alexandre Julliard · 3a2e8853 · 682ed910
Commit 682ed910 authored Nov 20, 2013 by Ken Thomases Committed by Alexandre Julliard Nov 21, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

cocoa_opengl.m dlls/winemac.drv/cocoa_opengl.m +4 -3

No files found.
--- a/dlls/winemac.drv/cocoa_opengl.m
+++ b/dlls/winemac.drv/cocoa_opengl.m
@@ -123,14 +123,15 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v)
        context.needsUpdate = FALSE;
        if (view)
        {
-            __block BOOL windowHasDevice;
+            __block BOOL viewIsValidDrawable;

            macdrv_add_view_opengl_context(v, c);

            OnMainThread(^{
-                windowHasDevice = [[view window] windowNumber] > 0;
+                viewIsValidDrawable = [[view window] windowNumber] > 0 &&
+                                      !NSIsEmptyRect([view visibleRect]);
            });
-            if (windowHasDevice)
+            if (viewIsValidDrawable)
            {
                [context setView:view];
                [context setLatentView:nil];