diff options
author | Michael Koch <konqueror@gmx.de> | 2004-10-22 09:49:01 +0000 |
---|---|---|
committer | Michael Koch <konqueror@gmx.de> | 2004-10-22 09:49:01 +0000 |
commit | 7bb649ae71437dd6ad37a9e48cd8ce4fa4633a57 (patch) | |
tree | bc79415397f098bc68a5043c4fe922438512bce1 | |
parent | 2aa195cc70aade6ae2d62e9ddacc1ca12623f360 (diff) | |
download | classpath-7bb649ae71437dd6ad37a9e48cd8ce4fa4633a57.tar.gz |
2004-10-22 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/ClasspathFontPeer.java
(setStandardAttributes(String,Map)): If size attribute doesn't
exist, default to size 12. Clamp size value to a minimum of 1.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | gnu/java/awt/peer/ClasspathFontPeer.java | 8 |
2 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2004-10-22 Thomas Fitzsimmons <fitzsim@redhat.com> + + * gnu/java/awt/peer/ClasspathFontPeer.java + (setStandardAttributes(String,Map)): If size attribute doesn't + exist, default to size 12. Clamp size value to a minimum of 1. + 2004-10-22 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractButton.java diff --git a/gnu/java/awt/peer/ClasspathFontPeer.java b/gnu/java/awt/peer/ClasspathFontPeer.java index 6bd3653ed..79b1adf18 100644 --- a/gnu/java/awt/peer/ClasspathFontPeer.java +++ b/gnu/java/awt/peer/ClasspathFontPeer.java @@ -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)) { |