NEWT/OSX CALayer Animation Fix: Use '[layer removeAllAnimations]', '[layer removeAnimationForKey: kCAOnOrderIn, kCAOnOrderOut, kCATransition]' doesn't work

2 files changed, 5 insertions, 11 deletions

diff --git a/src/jogl/native/macosx/MacOSXWindowSystemInterface-pbuffer.m b/src/jogl/native/macosx/MacOSXWindowSystemInterface-pbuffer.m
index fe896cc53..b713465f7 100644
--- a/src/jogl/native/macosx/MacOSXWindowSystemInterface-pbuffer.m
+++ b/src/jogl/native/macosx/MacOSXWindowSystemInterface-pbuffer.m
@@ -102,11 +102,6 @@ static CVReturn renderMyNSOpenGLLayer(CVDisplayLinkRef displayLink,
     pthread_mutex_init(&renderLock, &renderLockAttr); // recursive
     pthread_cond_init(&renderSignal, NULL); // no attribute
 
-    // no animations for add/remove/swap sublayers etc 
-    [self removeAnimationForKey: kCAOnOrderIn];
-    [self removeAnimationForKey: kCAOnOrderOut];
-    [self removeAnimationForKey: kCATransition];
-
     pbuffer = p;
     [pbuffer retain];
 
@@ -161,7 +156,6 @@ static CVReturn renderMyNSOpenGLLayer(CVDisplayLinkRef displayLink,
     shallDraw = NO;
 
     CGRect lRect = [self frame];
-
     DBG_PRINT("MyNSOpenGLLayer::init %p, ctx %p, pfmt %p, pbuffer %p, opaque %d, pbuffer %dx%d -> tex %dx%d, frame: %lf/%lf %lfx%lf (refcnt %d)\n", 
         self, _ctx, _fmt, pbuffer, opaque, [pbuffer pixelsWide], [pbuffer pixelsHigh], texWidth, texHeight,
         lRect.origin.x, lRect.origin.y, lRect.size.width, lRect.size.height, (int)[self retainCount]);
diff --git a/src/nativewindow/native/macosx/OSXmisc.m b/src/nativewindow/native/macosx/OSXmisc.m
index d64973b67..4aa455626 100644
--- a/src/nativewindow/native/macosx/OSXmisc.m
+++ b/src/nativewindow/native/macosx/OSXmisc.m
@@ -235,11 +235,6 @@ JNIEXPORT jlong JNICALL Java_jogamp_nativewindow_macosx_OSXUtil_CreateCALayer0
     // CALayer* layer = [[CALayer alloc] init];
     CALayer* layer = [CALayer layer];
 
-    // no animations for add/remove/swap sublayers etc 
-    [layer removeAnimationForKey: kCAOnOrderIn];
-    [layer removeAnimationForKey: kCAOnOrderOut];
-    [layer removeAnimationForKey: kCATransition];
-
     // initial dummy size !
     CGRect lRect = [layer frame];
     lRect.origin.x = 0;
@@ -285,6 +280,11 @@ JNIEXPORT void JNICALL Java_jogamp_nativewindow_macosx_OSXUtil_AddCASublayer0
         // simple 1:1 layout !
         [subLayer setFrame:lRectRoot];
         [rootLayer addSublayer:subLayer];
+
+        // no animations for add/remove/swap sublayers etc 
+        // doesn't work: [layer removeAnimationForKey: kCAOnOrderIn, kCAOnOrderOut, kCATransition]
+        [rootLayer removeAllAnimations];
+        [subLayer removeAllAnimations];
     }];
     DBG_PRINT("CALayer::AddCASublayer0.X: %p . %p (refcnt %d)\n", rootLayer, subLayer, (int)[subLayer retainCount]);
     JNF_COCOA_EXIT(env);