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

Fixed issues in the OS X backend port.

This commit is contained in:
Pietro Gagliardi 2015-10-08 12:19:48 -04:00
parent 52c6888a6b
commit 9089138f7f
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
macarea/draw.m
View File

@ -13,7 +13,7 @@ uiDrawPath *uiDrawNewPath(uiDrawFillMode mode)
// TODO uiNew // TODO uiNew
p = malloc(sizeof (uiDrawPath)); p = malloc(sizeof (uiDrawPath));
p->path = CGPathCreateMutable() p->path = CGPathCreateMutable();
p->fillMode = mode; p->fillMode = mode;
p->ended = NO; p->ended = NO;
return p; return p;
@ -38,9 +38,15 @@ void uiDrawPathNewFigure(uiDrawPath *p, double x, double y)
void uiDrawPathNewFigureWithArc(uiDrawPath *p, double xCenter, double yCenter, double radius, double startAngle, double endAngle) void uiDrawPathNewFigureWithArc(uiDrawPath *p, double xCenter, double yCenter, double radius, double startAngle, double endAngle)
{ {
double sinStart, cosStart;
double startx, starty;
if (p->ended) if (p->ended)
complain("attempt to add figure to ended path in uiDrawPathNewFigureWithArc()"); complain("attempt to add figure to ended path in uiDrawPathNewFigureWithArc()");
// TODO sinStart = sin(startAngle);
cosStart = cos(startAngle);
startx = xCenter + radius * cosStart;
starty = yCenter + radius * sinStart;
CGPathMoveToPoint(p->path, NULL, startx, starty); CGPathMoveToPoint(p->path, NULL, startx, starty);
uiDrawPathArcTo(p, xCenter, yCenter, radius, startAngle, endAngle); uiDrawPathArcTo(p, xCenter, yCenter, radius, startAngle, endAngle);
} }
@ -179,6 +185,7 @@ static void fillGradient(CGContextRef ctxt, uiDrawPath *p, uiDrawBrush *b)
CGColorSpaceRef colorspace; CGColorSpaceRef colorspace;
CGFloat *colors; CGFloat *colors;
CGFloat *locations; CGFloat *locations;
size_t i;
// gradients need a color space // gradients need a color space
// for consistency with windows, use sRGB // for consistency with windows, use sRGB
@ -200,6 +207,9 @@ static void fillGradient(CGContextRef ctxt, uiDrawPath *p, uiDrawBrush *b)
free(locations); free(locations);
free(colors); free(colors);
// because we're mucking with clipping, we need to save the graphics state and restore it later
CGContextSaveGState(ctxt);
// clip // clip
switch (p->fillMode) { switch (p->fillMode) {
case uiDrawFillModeWinding: case uiDrawFillModeWinding:
@ -232,6 +242,7 @@ static void fillGradient(CGContextRef ctxt, uiDrawPath *p, uiDrawBrush *b)
} }
// and clean up // and clean up
CGContextRestoreGState(ctxt);
CGGradientRelease(gradient); CGGradientRelease(gradient);
CGColorSpaceRelease(colorspace); CGColorSpaceRelease(colorspace);
} }
@ -240,7 +251,7 @@ void uiDrawFill(uiDrawContext *c, uiDrawPath *path, uiDrawBrush *b)
{ {
if (!path->ended) if (!path->ended)
complain("path not ended in uiDrawFill()"); complain("path not ended in uiDrawFill()");
CGContextAddPath(c->c, (CGPathRef) (p->path)); CGContextAddPath(c->c, (CGPathRef) (path->path));
switch (b->Type) { switch (b->Type) {
case uiDrawBrushTypeSolid: case uiDrawBrushTypeSolid:
fillSolid(c->c, path, b); fillSolid(c->c, path, b);