[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: ClasspathFontPeer fixes
Kaffe CVS
cvs-commits at kaffe.org
Sun Oct 24 05:16:43 PDT 2004
PatchSet 5350
Date: 2004/10/24 10:48:23
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: ClasspathFontPeer fixes
2004-10-24 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/gnu/java/awt/peer/ClasspathFontPeer.java:
Resynced with GNU Classpath.
2004-10-22 Thomas Fitzsimmons <fitzsim at 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.
Members:
ChangeLog:1.2902->1.2903
libraries/javalib/gnu/java/awt/peer/ClasspathFontPeer.java:1.2->1.3
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2902 kaffe/ChangeLog:1.2903
--- kaffe/ChangeLog:1.2902 Sun Oct 24 10:44:34 2004
+++ kaffe/ChangeLog Sun Oct 24 10:48:23 2004
@@ -1,5 +1,16 @@
2004-10-24 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/gnu/java/awt/peer/ClasspathFontPeer.java:
+ Resynced with GNU Classpath.
+
+ 2004-10-22 Thomas Fitzsimmons <fitzsim at 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-24 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/javax/swing/AbstractButton.java,
libraries/javalib/javax/swing/FocusManager.java,
libraries/javalib/javax/swing/JComponent.java,
Index: kaffe/libraries/javalib/gnu/java/awt/peer/ClasspathFontPeer.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/ClasspathFontPeer.java:1.2 kaffe/libraries/javalib/gnu/java/awt/peer/ClasspathFontPeer.java:1.3
--- kaffe/libraries/javalib/gnu/java/awt/peer/ClasspathFontPeer.java:1.2 Sat Oct 9 22:18:48 2004
+++ kaffe/libraries/javalib/gnu/java/awt/peer/ClasspathFontPeer.java Sun Oct 24 10:48:32 2004
@@ -218,7 +218,7 @@
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 @@
{
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))
{
More information about the kaffe
mailing list