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

Implemented negative arcs on GTK+.

This commit is contained in:
Pietro Gagliardi 2015-10-11 21:18:39 -04:00
parent 15c00330d6
commit e51fd6e494
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
unix/draw.c
View File

@ -10,6 +10,7 @@ struct uiDrawPath {
struct piece { struct piece {
int type; int type;
double d[8]; double d[8];
int b;
}; };
enum { enum {
@ -55,7 +56,7 @@ void uiDrawPathNewFigure(uiDrawPath *p, double x, double y)
add(p, &piece); add(p, &piece);
} }
void uiDrawPathNewFigureWithArc(uiDrawPath *p, double xCenter, double yCenter, double radius, double startAngle, double sweep) void uiDrawPathNewFigureWithArc(uiDrawPath *p, double xCenter, double yCenter, double radius, double startAngle, double sweep, int negative)
{ {
struct piece piece; struct piece piece;
@ -67,6 +68,7 @@ void uiDrawPathNewFigureWithArc(uiDrawPath *p, double xCenter, double yCenter, d
piece.d[2] = radius; piece.d[2] = radius;
piece.d[3] = startAngle; piece.d[3] = startAngle;
piece.d[4] = sweep; piece.d[4] = sweep;
piece.b = negative;
add(p, &piece); add(p, &piece);
} }
@ -80,7 +82,7 @@ void uiDrawPathLineTo(uiDrawPath *p, double x, double y)
add(p, &piece); add(p, &piece);
} }
void uiDrawPathArcTo(uiDrawPath *p, double xCenter, double yCenter, double radius, double startAngle, double sweep) void uiDrawPathArcTo(uiDrawPath *p, double xCenter, double yCenter, double radius, double startAngle, double sweep, int negative)
{ {
struct piece piece; struct piece piece;
@ -92,6 +94,7 @@ void uiDrawPathArcTo(uiDrawPath *p, double xCenter, double yCenter, double radiu
piece.d[2] = radius; piece.d[2] = radius;
piece.d[3] = startAngle; piece.d[3] = startAngle;
piece.d[4] = sweep; piece.d[4] = sweep;
piece.b = negative;
add(p, &piece); add(p, &piece);
} }
@ -138,6 +141,7 @@ static void runPath(uiDrawPath *p, cairo_t *cr)
{ {
guint i; guint i;
struct piece *piece; struct piece *piece;
void (*arc)(cairo_t *, double, double, double, double, double);
if (!p->ended) if (!p->ended)
complain("path not ended in runPath()"); complain("path not ended in runPath()");
@ -152,7 +156,10 @@ static void runPath(uiDrawPath *p, cairo_t *cr)
cairo_new_sub_path(cr); cairo_new_sub_path(cr);
// fall through // fall through
case arcTo: case arcTo:
cairo_arc(cr, arc = cairo_arc;
if (piece->b)
arc = cairo_arc_negative;
(*arc)(cr,
piece->d[0], piece->d[0],
piece->d[1], piece->d[1],
piece->d[2], piece->d[2],