From 50dc7cf2e8530eec078c1c0e1bcb6ffc381ff04d Mon Sep 17 00:00:00 2001 From: sekelsenmat Date: Tue, 13 Dec 2011 10:22:29 +0000 Subject: [PATCH] customdrawn-android: Improves the drawing of the bottom part of letters like g git-svn-id: trunk@34152 - --- .../android/src/com/pascal/lcltest/LCLActivity.java | 4 ++-- lcl/interfaces/customdrawn/customdrawnwinapi_android.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/androidlcl/android/src/com/pascal/lcltest/LCLActivity.java b/examples/androidlcl/android/src/com/pascal/lcltest/LCLActivity.java index 42eb57e153..b792371aa6 100755 --- a/examples/androidlcl/android/src/com/pascal/lcltest/LCLActivity.java +++ b/examples/androidlcl/android/src/com/pascal/lcltest/LCLActivity.java @@ -87,7 +87,7 @@ public class LCLActivity extends Activity // Don't use just localbounds.height() from the source text // because it will calculate the minimum necessary height, // but we can't easily use that to draw text because it draws relative to the baseline - localpaint.getTextBounds("Íq", 0, 2, localbounds); + localpaint.getTextBounds("Íqg", 0, 3, localbounds); lclheight = localbounds.height(); // Also get some measures lcltextascent = (int) localpaint.getFontMetrics().ascent; @@ -110,7 +110,7 @@ public class LCLActivity extends Activity localcanvas.drawColor(Color.TRANSPARENT); // TRANSPARENT // The Y coordinate is the lower baseline of letters like "abc" // see http://code.google.com/p/android/issues/detail?id=393 - localcanvas.drawText(lcltext, 0, lclheight - lcltextdescent, localpaint); + localcanvas.drawText(lcltext, 0, lclheight - lcltextbottom, localpaint); } // LCLType definitions diff --git a/lcl/interfaces/customdrawn/customdrawnwinapi_android.inc b/lcl/interfaces/customdrawn/customdrawnwinapi_android.inc index 9410374420..4da59e8730 100644 --- a/lcl/interfaces/customdrawn/customdrawnwinapi_android.inc +++ b/lcl/interfaces/customdrawn/customdrawnwinapi_android.inc @@ -4215,7 +4215,7 @@ begin lAverageCharWidth := javaEnvRef^^.GetIntField(javaEnvRef, javaActivityObject, javaField_lclwidth); // Prepare the input for getting the max height of a text and other metrics - lJavaString :=javaEnvRef^^.NewStringUTF(javaEnvRef, PChar('Íą')); + lJavaString :=javaEnvRef^^.NewStringUTF(javaEnvRef, PChar('Íg')); javaEnvRef^^.SetObjectField(javaEnvRef, javaActivityObject, JavaField_lcltext, lJavaString); javaEnvRef^^.SetIntField(javaEnvRef, javaActivityObject, javaField_lcltextsize, DefaultFontAndroidSize);