Don't allow > 1f scaling if constructed with maxWidth/maxHeight.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@1677 6335cc39-0255-0410-8fd6-9bcaacd3b74c
2005-07-17 10:06:32 +00:00
parent abc8eaa5f0
commit 1275a870bf
1 changed files with 3 additions and 2 deletions
@@ -39,8 +39,9 @@ public class ScaledIcon implements Icon
     */
    public ScaledIcon (Icon icon, int maxWidth, int maxHeight)
    {
-        this(icon, Math.min(maxWidth / (float) icon.getIconWidth(),
-                            maxHeight / (float) icon.getIconHeight()));
+        this(icon,
+            Math.min(1f, Math.min(maxWidth / (float) icon.getIconWidth(),
+                                  maxHeight / (float) icon.getIconHeight()));
    }

    // documentation inherited from interface Icon