2 files changed, 27 insertions, 27 deletions

diff --git a/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java b/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java
index 2eff1bc09..b712f6a1a 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/jawt/macosx/MacOSXJAWTWindow.java
@@ -135,34 +135,33 @@ public class MacOSXJAWTWindow extends JAWTWindow implements MutableSurface {
   }
   
   @Override
-  protected void layoutSurfaceLayerImpl(long layerHandle) {
+  protected void layoutSurfaceLayerImpl(long layerHandle, boolean visible) {
       final int caLayerQuirks = JAWTUtil.getOSXCALayerQuirks();
-      if( 0 != caLayerQuirks ) {
-          // AWT position is top-left w/ insets, where CALayer position is bottom/left from root CALayer w/o insets.
-          // Determine p0: components location on screen w/o insets.
-          // CALayer position will be determined in native code.
-          // See detailed description in {@link JAWTUtil#JAWT_OSX_CALAYER_QUIRK_LAYOUT}
-          final Point p0 = new Point();
-          final Component outterComp = getLocationOnScreenNonBlocking(p0, component);
-          final java.awt.Insets outterInsets = AWTMisc.getInsets(outterComp, true);
-          final Point p1 = (Point)p0.cloneMutable();
-          p1.translate(-outterComp.getX(), -outterComp.getY());
+      // AWT position is top-left w/ insets, where CALayer position is bottom/left from root CALayer w/o insets.
+      // Determine p0: components location on screen w/o insets.
+      // CALayer position will be determined in native code.
+      // See detailed description in {@link JAWTUtil#JAWT_OSX_CALAYER_QUIRK_LAYOUT}
+      final Point p0 = new Point();
+      final Component outterComp = getLocationOnScreenNonBlocking(p0, component);
+      final java.awt.Insets outterInsets = AWTMisc.getInsets(outterComp, true);
+      final Point p1 = (Point)p0.cloneMutable();
+      p1.translate(-outterComp.getX(), -outterComp.getY());
+      if( null != outterInsets ) {
+          p1.translate(-outterInsets.left, -outterInsets.top);
+      }
+      
+      if( DEBUG ) {
+          final java.awt.Point pA0 = component.getLocationOnScreen();
+          final Point pA1 = new Point(pA0.x, pA0.y);
+          pA1.translate(-outterComp.getX(), -outterComp.getY());
           if( null != outterInsets ) {
-              p1.translate(-outterInsets.left, -outterInsets.top);
-          }
-          
-          if( DEBUG ) {
-              final java.awt.Point pA0 = component.getLocationOnScreen();
-              final Point pA1 = new Point(pA0.x, pA0.y);
-              pA1.translate(-outterComp.getX(), -outterComp.getY());
-              if( null != outterInsets ) {
-                  pA1.translate(-outterInsets.left, -outterInsets.top);
-              }
-              System.err.println("JAWTWindow.layoutSurfaceLayerImpl: "+toHexString(layerHandle) + ", [ins "+outterInsets+"], pA "+pA0+" -> "+pA1+
-                      ", p0 "+p0+" -> "+p1+", bounds "+bounds);
+              pA1.translate(-outterInsets.left, -outterInsets.top);
           }
-          OSXUtil.FixCALayerLayout(rootSurfaceLayer, layerHandle, p1.getX(), p1.getY(), getWidth(), getHeight(), caLayerQuirks);
+          System.err.println("JAWTWindow.layoutSurfaceLayerImpl: "+toHexString(layerHandle) + ", quirks "+caLayerQuirks+", visible "+visible+
+                  ", [ins "+outterInsets+"], pA "+pA0+" -> "+pA1+
+                  ", p0 "+p0+" -> "+p1+", bounds "+bounds);
       }
+      OSXUtil.FixCALayerLayout(rootSurfaceLayer, layerHandle, visible, p1.getX(), p1.getY(), getWidth(), getHeight(), caLayerQuirks);
   }
   
   @Override
diff --git a/src/nativewindow/classes/jogamp/nativewindow/macosx/OSXUtil.java b/src/nativewindow/classes/jogamp/nativewindow/macosx/OSXUtil.java
index 2112131ed..b27affa7e 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/macosx/OSXUtil.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/macosx/OSXUtil.java
@@ -186,15 +186,16 @@ public class OSXUtil implements ToolkitProperties {
      * 
      * @param rootCALayer the root surface layer, maybe null.
      * @param subCALayer the client surface layer, maybe null.
+     * @param visible TODO
      * @param width the expected width
      * @param height the expected height
      * @param caLayerQuirks TODO
      */
-    public static void FixCALayerLayout(final long rootCALayer, final long subCALayer, final int x, final int y, final int width, final int height, final int caLayerQuirks) {
+    public static void FixCALayerLayout(final long rootCALayer, final long subCALayer, final boolean visible, final int x, final int y, final int width, final int height, final int caLayerQuirks) {
         if( 0==rootCALayer && 0==subCALayer ) {
             return;
         }
-        FixCALayerLayout0(rootCALayer, subCALayer, x, y, width, height, caLayerQuirks);
+        FixCALayerLayout0(rootCALayer, subCALayer, visible, x, y, width, height, caLayerQuirks);
     }
     
     /** 
@@ -358,7 +359,7 @@ public class OSXUtil implements ToolkitProperties {
     private static native long GetNSWindow0(long nsView);
     private static native long CreateCALayer0(int width, int height);
     private static native void AddCASublayer0(long rootCALayer, long subCALayer, int x, int y, int width, int height, int caLayerQuirks);
-    private static native void FixCALayerLayout0(long rootCALayer, long subCALayer, int x, int y, int width, int height, int caLayerQuirks);
+    private static native void FixCALayerLayout0(long rootCALayer, long subCALayer, boolean visible, int x, int y, int width, int height, int caLayerQuirks);
     private static native void RemoveCASublayer0(long rootCALayer, long subCALayer);
     private static native void DestroyCALayer0(long caLayer);
     private static native void RunOnMainThread0(Runnable runnable);