From: Simon Tatham <anakin@pobox.com>
Date: Sun, 22 Feb 2009 12:02:40 +0000 (+0000)
Subject: Fix the Java front end's vertical text positioning when
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=9249f096192b0a50e607024bf04736ef0506b5ea;p=sgt-puzzles.git

Fix the Java front end's vertical text positioning when
ALIGN_VNORMAL is in use: ALIGN_VNORMAL indicates that the supplied
y-coordinate denotes the _baseline_ of the text, not its top, so
adding on 'asc' to convert to the baseline is wrong.

This only affects Tents, at present.

[originally from svn r8452]
---

diff --git a/PuzzleApplet.java b/PuzzleApplet.java
index 23eda81..f401ecf 100644
--- a/PuzzleApplet.java
+++ b/PuzzleApplet.java
@@ -382,8 +382,6 @@ public class PuzzleApplet extends JApplet implements Runtime.CallJavaCB {
                     int asc = fm.getAscent(), desc = fm.getDescent();
                     if ((xarg3 & ALIGN_VCENTRE) != 0)
                         xarg2 += asc - (asc+desc)/2;
-                    else
-                        xarg2 += asc;
                     int wid = fm.stringWidth(text);
                     if ((xarg3 & ALIGN_HCENTRE) != 0)
                         xarg1 -= wid / 2;