From: megacz <megacz@xwt.org>
Date: Fri, 30 Jan 2004 07:39:40 +0000 (+0000)
Subject: 2003/10/18 06:39:36
X-Git-Tag: RC3~454
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=4f2865ea8ff67ac6688c66e13102bdc2d9d922cd;hp=0b5778eb4f2c369a058cf974be220a3ab36634bb;p=org.ibex.core.git

2003/10/18 06:39:36

darcs-hash:20040130073940-2ba56-3e78b8fb9cf632543a96f50c70ab58815bf888c4.gz
---

diff --git a/Makefile b/Makefile
index 3c977d9..688b15b 100644
--- a/Makefile
+++ b/Makefile
@@ -142,7 +142,7 @@ $(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/
 builtin_src := $(shell find src/org/xwt/builtin -name '*.*')
 build/res/fonts/vera: .download_vera-1.10
 	mkdir -p build/res/fonts
-	cd build/res/fonts; ln -s ../../../upstream/vera-1.10/ttf-bitstream-vera-1.10 vera
+	cd build/res/fonts; rm -f vera; ln -s ../../../upstream/vera-1.10/ttf-bitstream-vera-1.10 vera
 build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/freetype.mips build/res/libmspack.mips build/res/fonts/vera
 	@echo -e "\n\033[1mzipping            res/* -> .jar: builtin.jar\033[0m"
 	cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp
index 04a0ee2..32127af 100644
--- a/src/org/xwt/Box.java.pp
+++ b/src/org/xwt/Box.java.pp
@@ -515,9 +515,9 @@ public final class Box extends JS.Scope {
             if (g.p != null)
                 buf.drawPictureAlphaOnly(g.p,
                                          x,
-                                         y + g.max_ascent - g.baseline - g.max_descent,
+                                         y + g.max_ascent - g.baseline + g.max_descent,
                                          x + g.p.getWidth(),
-                                         y + g.max_ascent - g.baseline + g.p.getHeight() - g.max_descent,
+                                         y + g.max_ascent - g.baseline + g.max_descent + g.p.getHeight(),
                                          0, 0,
                                          g.p.getWidth(), g.p.getHeight(),
                                          textcolor);