You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/10/02 20:00:37 UTC
svn commit: r821116 - in /incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk:
effects/ScaleDecorator.java skin/CardPaneSkin.java
Author: tvolkert
Date: Fri Oct 2 18:00:37 2009
New Revision: 821116
URL: http://svn.apache.org/viewvc?rev=821116&view=rev
Log:
Applied workaround for Sun bug #6513150 (Zero scale AffineTransforms gives NPE in SunGraphics2D.getClipBounds())
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java?rev=821116&r1=821115&r2=821116&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java Fri Oct 2 18:00:37 2009
@@ -354,7 +354,9 @@
graphics.translate(tx, ty);
}
- graphics.scale(scaleX, scaleY);
+ // TODO revisit. This is a workaround for Sun bug #6513150, which
+ // fails if we apply a zero scale on the graphics (should be legal).
+ graphics.scale(Math.max(scaleX, Float.MIN_NORMAL), Math.max(scaleY, Float.MIN_NORMAL));
return graphics;
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java?rev=821116&r1=821115&r2=821116&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java Fri Oct 2 18:00:37 2009
@@ -223,9 +223,9 @@
float scale = (float)Math.abs(Math.cos(theta));
if (orientation == Orientation.HORIZONTAL) {
- scaleDecorator.setScale(Math.max(scale, 0.01f), 1.0f);
+ scaleDecorator.setScale(scale, 1.0f);
} else {
- scaleDecorator.setScale(1.0f, Math.max(scale, 0.01f));
+ scaleDecorator.setScale(1.0f, scale);
}
fromCard.setVisible(theta < Math.PI / 2);