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

Stale TODO removal. Expanded page 9 to also show the positions of the second line.

This commit is contained in:
Pietro Gagliardi 2016-05-22 20:49:16 -04:00
parent 9b4a13e9b3
commit b66be0bf2d
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
test/page9.c
View File

@ -25,12 +25,17 @@ static double entryDouble(uiEntry *e)
return d; return d;
} }
// TODO this should be altered not to restore all state on exit so default text colors can be checked
static void drawGuides(uiDrawContext *c, uiDrawTextFontMetrics *m) static void drawGuides(uiDrawContext *c, uiDrawTextFontMetrics *m)
{ {
uiDrawPath *p; uiDrawPath *p;
uiDrawBrush b; uiDrawBrush b;
uiDrawStrokeParams sp; uiDrawStrokeParams sp;
double leading;
double y;
leading = 0;
if (uiCheckboxChecked(addLeading))
leading = m->Leading;
memset(&b, 0, sizeof (uiDrawBrush)); memset(&b, 0, sizeof (uiDrawBrush));
b.Type = uiDrawBrushTypeSolid; b.Type = uiDrawBrushTypeSolid;
@ -43,8 +48,10 @@ static void drawGuides(uiDrawContext *c, uiDrawTextFontMetrics *m)
uiDrawSave(c); uiDrawSave(c);
p = uiDrawNewPath(uiDrawFillModeWinding); p = uiDrawNewPath(uiDrawFillModeWinding);
uiDrawPathNewFigure(p, 8, 10); y = 10;
uiDrawPathLineTo(p, 8, 10 + m->Ascent); uiDrawPathNewFigure(p, 8, y);
y += m->Ascent;
uiDrawPathLineTo(p, 8, y);
uiDrawPathEnd(p); uiDrawPathEnd(p);
b.R = 0.94; b.R = 0.94;
b.G = 0.5; b.G = 0.5;
@ -54,8 +61,9 @@ static void drawGuides(uiDrawContext *c, uiDrawTextFontMetrics *m)
uiDrawFreePath(p); uiDrawFreePath(p);
p = uiDrawNewPath(uiDrawFillModeWinding); p = uiDrawNewPath(uiDrawFillModeWinding);
uiDrawPathNewFigure(p, 8, 10 + m->Ascent); uiDrawPathNewFigure(p, 8, y);
uiDrawPathLineTo(p, 8, 10 + m->Ascent + m->Descent); y += m->Descent;
uiDrawPathLineTo(p, 8, y);
uiDrawPathEnd(p); uiDrawPathEnd(p);
b.R = 0.12; b.R = 0.12;
b.G = 0.56; b.G = 0.56;
@ -64,6 +72,33 @@ static void drawGuides(uiDrawContext *c, uiDrawTextFontMetrics *m)
uiDrawStroke(c, p, &b, &sp); uiDrawStroke(c, p, &b, &sp);
uiDrawFreePath(p); uiDrawFreePath(p);
// and again for the second line
p = uiDrawNewPath(uiDrawFillModeWinding);
y += leading;
uiDrawPathNewFigure(p, 8, y);
y += m->Ascent;
uiDrawPathLineTo(p, 8, y);
uiDrawPathEnd(p);
b.R = 0.94;
b.G = 0.5;
b.B = 0.5;
b.A = 0.75;
uiDrawStroke(c, p, &b, &sp);
uiDrawFreePath(p);
p = uiDrawNewPath(uiDrawFillModeWinding);
uiDrawPathNewFigure(p, 8, y);
y += m->Descent;
uiDrawPathLineTo(p, 8, y);
uiDrawPathEnd(p);
b.R = 0.12;
b.G = 0.56;
b.B = 1.0;
b.A = 0.75;
uiDrawStroke(c, p, &b, &sp);
uiDrawFreePath(p);
// and a box to text layout top-left corners
p = uiDrawNewPath(uiDrawFillModeWinding); p = uiDrawNewPath(uiDrawFillModeWinding);
uiDrawPathAddRectangle(p, 0, 0, 10, 10); uiDrawPathAddRectangle(p, 0, 0, 10, 10);
uiDrawPathEnd(p); uiDrawPathEnd(p);

1
unix/drawtext.c
View File

@ -156,7 +156,6 @@ void uiDrawTextFontDescribe(uiDrawTextFont *font, uiDrawTextFontDescriptor *desc
#define pangoToCairo(pango) (((double) (pango)) / PANGO_SCALE) #define pangoToCairo(pango) (((double) (pango)) / PANGO_SCALE)
#define cairoToPango(cairo) ((gint) ((cairo) * PANGO_SCALE)) #define cairoToPango(cairo) ((gint) ((cairo) * PANGO_SCALE))
// TODO this isn't enough; pango adds extra space to each layout
void uiDrawTextFontGetMetrics(uiDrawTextFont *font, uiDrawTextFontMetrics *metrics) void uiDrawTextFontGetMetrics(uiDrawTextFont *font, uiDrawTextFontMetrics *metrics)
{ {
PangoFontMetrics *pm; PangoFontMetrics *pm;