2002/04/28 07:29:02

darcs-hash:20040130064614-2ba56-6a173b1d8c1cc844957628079865673009080e25.gz

diff --git a/CHANGES b/CHANGES
index 7b57d40..26c28c1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -69,3 +69,6 @@
 
 27-Apr megacz XWT.java, Box.java: fixed ConversionError bug
 
+27-Apr megacz Platform.java: added a 3-pixel minimum for a font's
+              descent -- ensures that we have space for underlining.
+

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index 6c97cae..f958dd2 100644 (file)
--- a/src/org/xwt/Platform.java
+++ b/src/org/xwt/Platform.java
@@ -178,8 +178,8 @@ public class Platform {
     /** returns the maximum ascent of all glyphs in a given platform-specific font */
     public static int getMaxAscent(String font) { return platform._getMaxAscent(font); }
 
-    /** returns the maximum descent of all glyphs in a given platform-specific font */
-    public static int getMaxDescent(String font) { return platform._getMaxDescent(font); }
+    /** returns the maximum descent of all glyphs in a given platform-specific font. Three pixel minimum ensures space for underline. */
+    public static int getMaxDescent(String font) { return Math.max(3, platform._getMaxDescent(font)); }
 
     /** returns the maximum number of threads that the XWT engine can create without adversely affecting the host OS */
     public static int maxThreads() { return platform._maxThreads(); }