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

Fixed hanging errors in uiDrawCaret().

This commit is contained in:
Pietro Gagliardi 2017-02-10 19:29:07 -05:00
parent 5f05ebbffe
commit 6acb10a4fc
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
common/drawtext.c
View File

@ -10,24 +10,21 @@ void uiDrawCaret(uiDrawContext *c, double x, double y, uiDrawTextLayout *layout,
uiDrawPath *path; uiDrawPath *path;
uiDrawBrush brush; uiDrawBrush brush;
if (*line < 0)
*line = 0;
if (*line > (uiDrawTextLayoutNumLines(layout) - 1))
*line = (uiDrawTextLayoutNumLines(layout) - 1);
// TODO cap pos
xoff = uiDrawTextLayoutByteLocationInLine(layout, pos, *line); xoff = uiDrawTextLayoutByteLocationInLine(layout, pos, *line);
if (xoff < 0) { while (xoff < 0) {
size_t start, end; size_t start, end;
int incr;
if (*line > (uiDrawTextLayoutNumLines(layout) - 1)) { uiDrawTextLayoutLineByteRange(layout, *line, &start, &end);
*line = (uiDrawTextLayoutNumLines(layout) - 1); if (end < pos) // too far up
incr = -1; (*line)++;
} else { else
uiDrawTextLayoutLineByteRange(layout, *line, &start, &end); (*line)--;
incr = 1; xoff = uiDrawTextLayoutByteLocationInLine(layout, pos, *line);
if (end < pos)
incr = -1;
}
while (xoff < 0) {
*line += incr;
xoff = uiDrawTextLayoutByteLocationInLine(layout, pos, *line);
}
} }
uiDrawTextLayoutLineGetMetrics(layout, *line, &m); uiDrawTextLayoutLineGetMetrics(layout, *line, &m);