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

Fixed the hit-test example to manage the cursor more sanely.

This commit is contained in:
Pietro Gagliardi 2017-02-08 21:52:52 -05:00
parent d53bc88f50
commit b96114e02d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
examples/drawtext/hittest.c
View File

@ -35,7 +35,8 @@ static uiLabel *caretLabel;
static uiCheckbox *showLineBounds; static uiCheckbox *showLineBounds;
static int caretLine = -1; static int caretLine = -1;
static double caretX; static size_t caretPos;
//static double caretX;
// TODO should be const? // TODO should be const?
static uiDrawBrush fillBrushes[4] = { static uiDrawBrush fillBrushes[4] = {
@ -86,6 +87,7 @@ static void draw(uiAreaDrawParams *p)
uiDrawTextLayout *layout; uiDrawTextLayout *layout;
uiDrawTextLayoutLineMetrics m; uiDrawTextLayoutLineMetrics m;
uiDrawBrush brush; uiDrawBrush brush;
double caretX;
// only clip the text, not the guides // only clip the text, not the guides
uiDrawSave(p->Context); uiDrawSave(p->Context);
@ -107,10 +109,10 @@ static void draw(uiAreaDrawParams *p)
if (caretLine == -1) { if (caretLine == -1) {
caretLine = uiDrawTextLayoutNumLines(layout) - 1; caretLine = uiDrawTextLayoutNumLines(layout) - 1;
caretX = uiDrawTextLayoutByteLocationInLine(layout, caretPos = uiAttributedStringLen(attrstr);
uiAttributedStringLen(attrstr),
caretLine);
} }
caretX = uiDrawTextLayoutByteLocationInLine(layout,
caretPos, caretLine);
uiDrawTextLayoutLineGetMetrics(layout, caretLine, &m); uiDrawTextLayoutLineGetMetrics(layout, caretLine, &m);
path = uiDrawNewPath(uiDrawFillModeWinding); path = uiDrawNewPath(uiDrawFillModeWinding);
uiDrawPathNewFigure(path, margins + caretX, margins + m.Y); uiDrawPathNewFigure(path, margins + caretX, margins + m.Y);
@ -154,7 +156,6 @@ static void mouse(uiAreaMouseEvent *e)
{ {
uiDrawTextLayout *layout; uiDrawTextLayout *layout;
// uiDrawTextLayoutHitTestResult res; // uiDrawTextLayoutHitTestResult res;
size_t pos;
char labelText[128]; char labelText[128];
if (e->Down != 1) if (e->Down != 1)
@ -166,15 +167,15 @@ static void mouse(uiAreaMouseEvent *e)
uiDrawTextLayoutHitTest(layout, uiDrawTextLayoutHitTest(layout,
e->X - margins, e->Y - margins, e->X - margins, e->Y - margins,
// &res); // &res);
&pos, &caretLine); &caretPos, &caretLine);
caretX = uiDrawTextLayoutByteLocationInLine(layout, pos, caretLine); // caretX = uiDrawTextLayoutByteLocationInLine(layout, pos, caretLine);
uiDrawFreeTextLayout(layout); uiDrawFreeTextLayout(layout);
// urgh %zd is not supported by MSVC with sprintf() // urgh %zd is not supported by MSVC with sprintf()
// TODO get that part in test/ about having no other option // TODO get that part in test/ about having no other option
// TODO byte 1 is actually byte 684?! // TODO byte 1 is actually byte 684?!
sprintf(labelText, "pos %d line %d x %g",// x position %s y position %s", sprintf(labelText, "pos %d line %d",// x %g",// x position %s y position %s",
(int) pos, caretLine, caretX); (int) caretPos, caretLine);//, caretX);
/* (int) (res.Pos), res.Line, /* (int) (res.Pos), res.Line,
positions[res.XPosition], positions[res.XPosition],
positions[res.YPosition]); positions[res.YPosition]);