adds a few more bits of info for StandardGlyphVector

BobHanson · BobHanson · commit 87ae8456af9c · 2025-02-28T15:19:37.000-06:00
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20250224211151 
+20250228085852 
diff --git a/sources/net.sf.j2s.java.core/src/sun/font/StandardGlyphVector.java b/sources/net.sf.j2s.java.core/src/sun/font/StandardGlyphVector.java
@@ -144,7 +144,11 @@ private static class JSTextMetrics {
 		float actualBoundingBoxAscent;
 		float actualBoundingBoxRight;
 		float actualBoundingBoxDescent;
+		float fontBoundingBoxAscent;
+		float fontBoundingBoxDescent;
+		float offsetX, offsetY;
 		private String text;
+		private float logicalWidth;
 		
 		
 		public JSTextMetrics(String text, JSTextMetrics tm) {
@@ -154,6 +158,11 @@ public JSTextMetrics(String text, JSTextMetrics tm) {
 			this.actualBoundingBoxDescent = tm.actualBoundingBoxDescent;
 			this.actualBoundingBoxLeft = tm.actualBoundingBoxLeft;
 			this.actualBoundingBoxRight = tm.actualBoundingBoxRight;
+			this.fontBoundingBoxAscent = tm.fontBoundingBoxAscent;
+			this.fontBoundingBoxDescent = tm.fontBoundingBoxDescent;
+			this.logicalWidth = actualBoundingBoxRight - actualBoundingBoxLeft;
+			this.offsetX = -actualBoundingBoxLeft;
+			this.offsetY = actualBoundingBoxAscent + fontBoundingBoxDescent;
 //			System. intln("jstxtm" 
 //			+ " " + this.actualBoundingBoxLeft 
 //			+ " " + this.actualBoundingBoxRight 
@@ -169,8 +178,9 @@ protected Rectangle2D.Float getActualBounds(float x0, float y0) {
 		}
 		
 		protected float getLogicalWidth() {
-			return actualBoundingBoxRight - actualBoundingBoxLeft;
+			return logicalWidth;
 		}
+		
 	}
 	
 	
