colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-28 13:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/CPAnimationContext' into CPAnimationContext

Browse Source 
Conflicts:
	AppKit/CoreAnimation/CPViewAnimator.j
	Tests/Manual/CPAnimatablePropertyContainerTest/Resources/MainMenu.cib
	Tests/Manual/CPAnimatablePropertyContainerTest/Resources/MainMenu.xib
This commit is contained in:
cacaodev
2015-03-14 21:31:12 +01:00
parent 36f6fec99f b951624ed3
commit 50a53181dc
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CoreAnimation/CPAnimationContext.j
+3 -2
View File
@@ -85,7 +85,7 @@ var _CPAnimationContextStack = nil,
if (!_animationFlushingObserver)
{
CPLog.debug("create new observer");
_animationFlushingObserver = CFRunLoopObserverCreate(2, true, 0,_animationFlushingObserverCallback,0);
_animationFlushingObserver = CFRunLoopObserverCreate(2, true, 0, _animationFlushingObserverCallback,0);
CFRunLoopAddObserver([CPRunLoop mainRunLoop], _animationFlushingObserver);
}
}
@@ -128,6 +128,7 @@ CPLog.debug(_cmd + "context stack =" + _CPAnimationContextStack);
return;
var animByKeyPath = _animationsByObject.get(anObject);
if (!animByKeyPath)
{
var newAnimByKeyPath = @{aKeyPath:resolvedAction};
@@ -340,7 +341,7 @@ CPLog.debug(_cmd + "context stack =" + _CPAnimationContextStack);
};
}
[self getAnimations:cssAnimations getTimers:timers forView:aSubview usingAction:action rootView:rootView cssAnimate:!customLayout];
[self getAnimations:cssAnimations getTimers:timers forView:aSubview usingAction:action rootView:rootView cssAnimate:!customLayout];
}];
}
}
Tests/Manual/CPAnimatablePropertyContainerTest/Resources/MainMenu.cib
+5 -1
View File
File diff suppressed because one or more lines are too long