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

Fixed the failing test.

This commit is contained in:
Pietro Gagliardi 2015-10-12 00:27:34 -04:00
parent f4b0e7e35e
commit 41a33a1aa1
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
darwin/draw.m
View File

@ -160,7 +160,9 @@ void uiDrawStroke(uiDrawContext *c, uiDrawPath *path, uiDrawBrush *b, uiDrawStro
cap, cap,
join, join,
p->MiterLimit); p->MiterLimit);
p2.fillMode = path->fillMode; // always draw stroke fills using the winding rule
// otherwise intersecting figures won't draw correctly
p2.fillMode = uiDrawFillModeWinding;
p2.ended = path->ended; p2.ended = path->ended;
uiDrawFill(c, &p2, b); uiDrawFill(c, &p2, b);
// and clean up // and clean up

19
test/drawtests.c
View File

@ -1154,27 +1154,28 @@ static void drawCSFillStyle(uiAreaDrawParams *p)
uiDrawMatrix m; uiDrawMatrix m;
crsourcergba(&source, 0, 0, 0, 1); crsourcergba(&source, 0, 0, 0, 1);
sp.Cap = uiDrawLineCapFlat;
sp.Join = uiDrawLineJoinMiter; sp.Join = uiDrawLineJoinMiter;
sp.MiterLimit = uiDrawDefaultMiterLimit; sp.MiterLimit = uiDrawDefaultMiterLimit;
sp.Thickness = 6; sp.Thickness = 6;
path = uiDrawNewPath(uiDrawFillModeAlternate); path = uiDrawNewPath(uiDrawFillModeAlternate);
// uiDrawPathAddRectangle(path, 12, 12, 232, 70); uiDrawPathAddRectangle(path, 12, 12, 232, 70);
uiDrawPathNewFigureWithArc(path, uiDrawPathNewFigureWithArc(path,
64, 64, 64, 64,
40, 40,
0, 2*M_PI, 0, 2*M_PI,
0); 0);
/* uiDrawPathNewFigureWithArc(path, uiDrawPathNewFigureWithArc(path,
192, 64, 192, 64,
40, 40,
0, -2*M_PI, 0, -2*M_PI,
1); 1);
*/ uiDrawPathEnd(path); uiDrawPathEnd(path);
crsourcergba(&source, 0, 0.7, 0, 1); crsourcergba(&source, 0, 0.7, 0, 1);
// uiDrawFill(p->Context, path, &source); uiDrawFill(p->Context, path, &source);
crsourcergba(&source, 0, 0, 0, 1); crsourcergba(&source, 0, 0, 0, 1);
uiDrawStroke(p->Context, path, &source, &sp); uiDrawStroke(p->Context, path, &source, &sp);
uiDrawFreePath(path); uiDrawFreePath(path);
@ -1184,8 +1185,8 @@ static void drawCSFillStyle(uiAreaDrawParams *p)
uiDrawTransform(p->Context, &m); uiDrawTransform(p->Context, &m);
path = uiDrawNewPath(uiDrawFillModeWinding); path = uiDrawNewPath(uiDrawFillModeWinding);
// uiDrawPathAddRectangle(path, 12, 12, 232, 70); uiDrawPathAddRectangle(path, 12, 12, 232, 70);
/* uiDrawPathNewFigureWithArc(path, uiDrawPathNewFigureWithArc(path,
64, 64, 64, 64,
40, 40,
0, 2*M_PI, 0, 2*M_PI,
@ -1195,12 +1196,12 @@ static void drawCSFillStyle(uiAreaDrawParams *p)
40, 40,
0, -2*M_PI, 0, -2*M_PI,
1); 1);
*/ uiDrawPathEnd(path); uiDrawPathEnd(path);
crsourcergba(&source, 0, 0, 0.9, 1); crsourcergba(&source, 0, 0, 0.9, 1);
// uiDrawFill(p->Context, path, &source); uiDrawFill(p->Context, path, &source);
crsourcergba(&source, 0, 0, 0, 1); crsourcergba(&source, 0, 0, 0, 1);
// uiDrawStroke(p->Context, path, &source, &sp); uiDrawStroke(p->Context, path, &source, &sp);
uiDrawFreePath(path); uiDrawFreePath(path);
} }