From 1ca9a28f2d42aa2e45fadb10c7e249f1234bd0ab Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Mon, 23 Jan 2017 15:07:28 -0500
Subject: [PATCH] More work.

---
 darwin/drawtext.m | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/darwin/drawtext.m b/darwin/drawtext.m
index 08f37ed8..69166610 100644
--- a/darwin/drawtext.m
+++ b/darwin/drawtext.m
@@ -6,6 +6,8 @@
 @property NSRange glyphRange;
 @property NSRange characterRange;
 @property NSRect lineRect;
+@property NSRect lineUsedRect;
+@property NSRect glyphBoundingRect;
 @property CGFloat baselineOffset;
 @end
 
@@ -117,9 +119,15 @@ uiDrawTextLayout *uiDrawNewTextLayout(uiAttributedString *s, uiDrawFontDescripto
 		li.glyphRange = glyphRange;
 		li.characterRange = [tl->layoutManager characterRangeForGlyphRange:li.glyphRange actualGlyphRange:NULL];
 		li.lineRect = lineRect;
+		li.lineUsedRect = [tl->layoutManager lineFragmentUsedRectForGlyphAtIndex:index effectiveRange:NULL];
+		li.glyphBoundingRect = [tl->layoutManager boundingRectForGlyphRange:li.glyphRange inTextContainer:tl->container];
 		// and this is from http://www.cocoabuilder.com/archive/cocoa/308568-how-to-get-baseline-info.html and http://www.cocoabuilder.com/archive/cocoa/199283-height-and-location-of-text-within-line-in-nslayoutmanager-ignoring-spacing.html
 		li.baselineOffset = [[tl->layoutManager typesetter] baselineOffsetInLayoutManager:tl->layoutManager glyphIndex:index];
 		[tl->lineInfo addObject:li];
+NSLog(@"line %d", (int)[tl->lineInfo count]);
+NSLog(@"      rect %@", NSStringFromRect(li.lineRect));
+NSLog(@" used rect %@", NSStringFromRect(li.lineUsedRect));
+NSLog(@"glyph rect %@", NSStringFromRect(li.glyphBoundingRect));
 		[li release];
 		index = glyphRange.location + glyphRange.length;
 	}
@@ -197,7 +205,8 @@ void uiDrawTextLayoutLineGetMetrics(uiDrawTextLayout *tl, int line, uiDrawTextLa
 
 	m->X = li.lineRect.origin.x;
 	m->Y = li.lineRect.origin.y;
-	m->Width = li.lineRect.size.width;
+	// if we use li.lineRect here we get the whole line, not just the part with stuff in it
+	m->Width = li.lineUsedRect.size.width;
 	m->Height = li.lineRect.size.height;
 
 	// TODO is this correct?