interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TODO cleanup and stale TODO removal. That nLines == 0 TODO needs more testing...

This commit is contained in:
Pietro Gagliardi 2017-02-24 18:46:53 -05:00
parent 28b30367e2
commit 5fe4e27c5d
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
darwin/drawtext.m
View File

@ -37,7 +37,7 @@ struct uiDrawTextLayout {
size_t nUTF16; size_t nUTF16;
}; };
// TODO this is wrong for our hit-test example's multiple combining character example // TODO document that lines may or may not overlap because ours do in the case of multiple combining characters
static uiDrawTextLayoutLineMetrics *computeLineMetrics(CTFrameRef frame, CGSize size) static uiDrawTextLayoutLineMetrics *computeLineMetrics(CTFrameRef frame, CGSize size)
{ {
uiDrawTextLayoutLineMetrics *metrics; uiDrawTextLayoutLineMetrics *metrics;
@ -65,7 +65,6 @@ static uiDrawTextLayoutLineMetrics *computeLineMetrics(CTFrameRef frame, CGSize
// this is equivalent to boundsNoLeading.size.height + boundsNoLeading.origin.y (manually verified) // this is equivalent to boundsNoLeading.size.height + boundsNoLeading.origin.y (manually verified)
ascent = bounds.size.height + bounds.origin.y; ascent = bounds.size.height + bounds.origin.y;
descent = -boundsNoLeading.origin.y; descent = -boundsNoLeading.origin.y;
// TODO does this preserve leading sign?
leading = -bounds.origin.y - descent; leading = -bounds.origin.y - descent;
// Core Text always rounds these up for paragraph style calculations; there is a flag to control it but it's inaccessible (and this behavior is turned off for old versions of iPhoto) // Core Text always rounds these up for paragraph style calculations; there is a flag to control it but it's inaccessible (and this behavior is turned off for old versions of iPhoto)
@ -101,7 +100,6 @@ static uiDrawTextLayoutLineMetrics *computeLineMetrics(CTFrameRef frame, CGSize
// go from bottom-left corner to top-left // go from bottom-left corner to top-left
metrics[i].Y -= metrics[i].Height; metrics[i].Y -= metrics[i].Height;
metrics[i].BaselineY = size.height - metrics[i].BaselineY; metrics[i].BaselineY = size.height - metrics[i].BaselineY;
// TODO also adjust by metrics[i].Height?
} }
uiFree(origins); uiFree(origins);
@ -121,7 +119,6 @@ uiDrawTextLayout *uiDrawNewTextLayout(uiDrawTextLayoutParams *p)
range.length = CFAttributedStringGetLength(tl->attrstr); range.length = CFAttributedStringGetLength(tl->attrstr);
tl->width = p->Width; tl->width = p->Width;
// TODO CTFrameProgression for RTL/LTR
// TODO kCTParagraphStyleSpecifierMaximumLineSpacing, kCTParagraphStyleSpecifierMinimumLineSpacing, kCTParagraphStyleSpecifierLineSpacingAdjustment for line spacing // TODO kCTParagraphStyleSpecifierMaximumLineSpacing, kCTParagraphStyleSpecifierMinimumLineSpacing, kCTParagraphStyleSpecifierLineSpacingAdjustment for line spacing
tl->framesetter = CTFramesetterCreateWithAttributedString(tl->attrstr); tl->framesetter = CTFramesetterCreateWithAttributedString(tl->attrstr);
if (tl->framesetter == NULL) { if (tl->framesetter == NULL) {
@ -131,8 +128,6 @@ uiDrawTextLayout *uiDrawNewTextLayout(uiDrawTextLayoutParams *p)
cgwidth = (CGFloat) (tl->width); cgwidth = (CGFloat) (tl->width);
if (cgwidth < 0) if (cgwidth < 0)
cgwidth = CGFLOAT_MAX; cgwidth = CGFLOAT_MAX;
// TODO these seem to be floor()'d or truncated?
// TODO double check to make sure this TODO was right
tl->size = CTFramesetterSuggestFrameSizeWithConstraints(tl->framesetter, tl->size = CTFramesetterSuggestFrameSizeWithConstraints(tl->framesetter,
range, range,
// TODO kCTFramePathWidthAttributeName? // TODO kCTFramePathWidthAttributeName?
@ -209,8 +204,8 @@ void uiDrawText(uiDrawContext *c, uiDrawTextLayout *tl, double x, double y)
CGContextRestoreGState(c->c); CGContextRestoreGState(c->c);
} }
// TODO document that the width and height of a layout is not necessarily the sum of the widths and heights of its constituent lines; this is definitely untrue on OS X, where lines are placed in such a way that the distance between baselines is always integral // TODO document that the width and height of a layout is not necessarily the sum of the widths and heights of its constituent lines
// TODO width doesn't include trailing whitespace... // TODO width doesn't include trailing whitespace... (TODO on which platforms?)
// TODO figure out how paragraph spacing should play into this // TODO figure out how paragraph spacing should play into this
void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height) void uiDrawTextLayoutExtents(uiDrawTextLayout *tl, double *width, double *height)
{ {
@ -239,8 +234,8 @@ void uiDrawTextLayoutLineGetMetrics(uiDrawTextLayout *tl, int line, uiDrawTextLa
*m = tl->lineMetrics[line]; *m = tl->lineMetrics[line];
} }
// TODO note that in some cases lines can overlap slightly // in the case of overlapping lines, we read lines first to last and use their bottommost point (Y + Height) to determine where the next line should start for hit-testing
// in our case, we read lines first to last and use their bottommost point (Y + Height) to determine where the next line should start for hit-testing // TODO should we document this?
void uiDrawTextLayoutHitTest(uiDrawTextLayout *tl, double x, double y, size_t *pos, int *line) void uiDrawTextLayoutHitTest(uiDrawTextLayout *tl, double x, double y, size_t *pos, int *line)
{ {
int i; int i;