diff options
Diffstat (limited to 'libjava/gnu/java/awt/peer/ClasspathFontPeer.java')
| -rw-r--r-- | libjava/gnu/java/awt/peer/ClasspathFontPeer.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libjava/gnu/java/awt/peer/ClasspathFontPeer.java b/libjava/gnu/java/awt/peer/ClasspathFontPeer.java index 6b753aa15ec..79b1adf1807 100644 --- a/libjava/gnu/java/awt/peer/ClasspathFontPeer.java +++ b/libjava/gnu/java/awt/peer/ClasspathFontPeer.java @@ -160,7 +160,7 @@ public abstract class ClasspathFontPeer return name; } - protected static void copyStyleToAttrs (int style, Map attrs) + public static void copyStyleToAttrs (int style, Map attrs) { if ((style & Font.BOLD) == Font.BOLD) attrs.put (TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD); @@ -179,7 +179,7 @@ public abstract class ClasspathFontPeer attrs.put (TextAttribute.FAMILY, fam); } - protected static void copySizeToAttrs (float size, Map attrs) + public static void copySizeToAttrs (float size, Map attrs) { attrs.put (TextAttribute.SIZE, new Float (size)); } @@ -218,7 +218,7 @@ public abstract class ClasspathFontPeer AffineTransform trans = this.transform; float size = this.size; int style = this.style; - + if (attribs.containsKey (TextAttribute.FAMILY)) family = (String) attribs.get (TextAttribute.FAMILY); @@ -243,7 +243,13 @@ public abstract class ClasspathFontPeer { Float sz = (Float) attribs.get (TextAttribute.SIZE); size = sz.floatValue (); + + // Pango doesn't accept 0 as a font size. + if (size < 1) + size = 1; } + else + size = 12; if (attribs.containsKey (TextAttribute.TRANSFORM)) { |
