From 92764721a1705e68c0dbf2fe77b22ded26e2f9b4 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 14 Apr 2023 18:01:51 +0200 Subject: GraphUI Demo FontView01: Separate general font metrix (height, line-height) from actual Glyph metrix --- src/demos/com/jogamp/opengl/demos/graph/ui/FontView01.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/demos/com/jogamp/opengl') diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/FontView01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/FontView01.java index cf9330e22..18a6c77d4 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/FontView01.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/FontView01.java @@ -282,13 +282,13 @@ public class FontView01 { final OutlineShape os = g.getShape(); final int osVertices = null != os ? os.getOutlineVectexCount() : 0; final String ws = g.isWhiteSpace() ? ", ws" : ""; - return String.format((Locale)null, "%s%nSymbol: 0x%s, id 0x%s%s%nName: %s%nDim %1.3f x %1.3f%nAdvance %1.3f%nHeight: %1.3f%nLine Height: %1.3f%nLS Bearings: %1.3f%nVertices: %d%n ", + return String.format((Locale)null, "%s%nHeight: %1.3f%nLine Height: %1.3f%n%nSymbol: 0x%s, id 0x%s%s%nName: %s%nDim %1.3f x %1.3f%nAdvance %1.3f%nLS Bearings: %1.3f%nVertices: %d%n ", g.getFont().getFullFamilyName(), + g.getFont().getMetrics().getAscent() - g.getFont().getMetrics().getDescent(), // font hhea table + g.getFont().getLineHeight(), // font hhea table Integer.toHexString(symbol), Integer.toHexString(g.getID()), ws, g.getName(), g.getBounds().getWidth(), g.getBounds().getHeight(), g.getAdvance(), - g.getFont().getMetrics().getAscent() - g.getFont().getMetrics().getDescent(), - g.getFont().getLineHeight(), g.getLeftSideBearings(), osVertices ); } -- cgit v1.2.3