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

Implemented dashing on OS X.

This commit is contained in:
Pietro Gagliardi 2015-10-16 11:05:08 -04:00
parent 8119a69572
commit b4cbf79cbb
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
darwin/draw.m
View File

@ -124,6 +124,9 @@ void uiDrawStroke(uiDrawContext *c, uiDrawPath *path, uiDrawBrush *b, uiDrawStro
{ {
CGLineCap cap; CGLineCap cap;
CGLineJoin join; CGLineJoin join;
CGPathRef dashPath;
CGFloat *dashes;
size_t i;
uiDrawPath p2; uiDrawPath p2;
if (!path->ended) if (!path->ended)
@ -153,13 +156,29 @@ void uiDrawStroke(uiDrawContext *c, uiDrawPath *path, uiDrawBrush *b, uiDrawStro
} }
// create a temporary path identical to the previous one // create a temporary path identical to the previous one
dashPath = (CGPathRef) path->path;
if (p->NumDashes != 0) {
dashes = (CGFloat *) uiAlloc(p->NumDashes * sizeof (CGFloat), "CGFloat[]");
for (i = 0; i < p->NumDashes; i++)
dashes[i] = p->Dashes[i];
dashPath = CGPathCreateCopyByDashingPath(path->path,
NULL,
p->DashPhase,
dashes,
p->NumDashes);
uiFree(dashes);
}
// the documentation is wrong: this produces a path suitable for calling CGPathCreateCopyByStrokingPath(), not for filling directly
// the cast is safe; we never modify the CGPathRef and always cast it back to a CGPathRef anyway // the cast is safe; we never modify the CGPathRef and always cast it back to a CGPathRef anyway
p2.path = (CGMutablePathRef) CGPathCreateCopyByStrokingPath(path->path, p2.path = (CGMutablePathRef) CGPathCreateCopyByStrokingPath(dashPath,
NULL, NULL,
p->Thickness, p->Thickness,
cap, cap,
join, join,
p->MiterLimit); p->MiterLimit);
if (p->NumDashes != 0)
CGPathRelease(dashPath);
// always draw stroke fills using the winding rule // always draw stroke fills using the winding rule
// otherwise intersecting figures won't draw correctly // otherwise intersecting figures won't draw correctly
p2.fillMode = uiDrawFillModeWinding; p2.fillMode = uiDrawFillModeWinding;

2
windows/draw.c
View File

@ -607,7 +607,7 @@ void uiDrawStroke(uiDrawContext *c, uiDrawPath *p, uiDrawBrush *b, uiDrawStrokeP
&style); &style);
if (hr != S_OK) if (hr != S_OK)
logHRESULT("error creating stroke style in uiDrawStroke()", hr); logHRESULT("error creating stroke style in uiDrawStroke()", hr);
if (dashes != NULL) if (sp->NumDashes != 0)
uiFree(dashes); uiFree(dashes);
cliplayer = applyClip(c); cliplayer = applyClip(c);