You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by ca...@apache.org on 2008/11/06 05:16:40 UTC
svn commit: r711768 - in /xmlgraphics/batik/trunk: CHANGES
sources/org/apache/batik/anim/AnimationEngine.java
Author: cam
Date: Wed Nov 5 20:16:39 2008
New Revision: 711768
URL: http://svn.apache.org/viewvc?rev=711768&view=rev
Log:
Fix animation priority when a frozen animation is removed.
(Fixes bug 46155.)
Modified:
xmlgraphics/batik/trunk/CHANGES
xmlgraphics/batik/trunk/sources/org/apache/batik/anim/AnimationEngine.java
Modified: xmlgraphics/batik/trunk/CHANGES
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/CHANGES?rev=711768&r1=711767&r2=711768&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/CHANGES (original)
+++ xmlgraphics/batik/trunk/CHANGES Wed Nov 5 20:16:39 2008
@@ -37,6 +37,8 @@
* Now uses float for Document Dimensions.
* Ensure motion animations that are removed from a document don't
cause an NPE.
+ * Animations that become frozen are now not incorrectly deprioritised
+ compared to other animations on the same attribute.
1.7beta1 -> 1.7
---------------
Modified: xmlgraphics/batik/trunk/sources/org/apache/batik/anim/AnimationEngine.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/sources/org/apache/batik/anim/AnimationEngine.java?rev=711768&r1=711767&r2=711768&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/sources/org/apache/batik/anim/AnimationEngine.java (original)
+++ xmlgraphics/batik/trunk/sources/org/apache/batik/anim/AnimationEngine.java Wed Nov 5 20:16:39 2008
@@ -475,13 +475,11 @@
public void toInactive(AbstractAnimation anim, boolean isFrozen) {
anim.isActive = false;
anim.isFrozen = isFrozen;
- anim.beginTime = Float.NEGATIVE_INFINITY;
anim.markDirty();
if (!isFrozen) {
anim.value = null;
+ anim.beginTime = Float.NEGATIVE_INFINITY;
moveToBottom(anim);
- } else {
- pushDown(anim);
}
}