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

Merge 33bb32f65d into fea45b2d5b

This commit is contained in:
Mike Sinkovsky 2021-01-02 10:21:54 -05:00 committed by GitHub
parent fea45b2d5b 33bb32f65d
commit 728f6589ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
unix/drawmatrix.c
View File

@ -31,35 +31,41 @@ static void c2m(cairo_matrix_t *c, uiDrawMatrix *m)
void uiDrawMatrixTranslate(uiDrawMatrix *m, double x, double y) void uiDrawMatrixTranslate(uiDrawMatrix *m, double x, double y)
{ {
cairo_matrix_t c; cairo_matrix_t c;
cairo_matrix_t tmp;
m2c(m, &c); m2c(m, &c);
cairo_matrix_translate(&c, x, y); cairo_matrix_init_translate(&tmp, x, y);
cairo_matrix_multiply(&c, &c, &tmp);
c2m(&c, m); c2m(&c, m);
} }
void uiDrawMatrixScale(uiDrawMatrix *m, double xCenter, double yCenter, double x, double y) void uiDrawMatrixScale(uiDrawMatrix *m, double xCenter, double yCenter, double x, double y)
{ {
cairo_matrix_t c; cairo_matrix_t c;
cairo_matrix_t tmp;
double xt, yt; double xt, yt;
m2c(m, &c); m2c(m, &c);
xt = x; xt = x;
yt = y; yt = y;
uiprivScaleCenter(xCenter, yCenter, &xt, &yt); uiprivScaleCenter(xCenter, yCenter, &xt, &yt);
cairo_matrix_translate(&c, xt, yt); cairo_matrix_init_translate(&tmp, xt, yt);
cairo_matrix_scale(&c, x, y); cairo_matrix_scale(&tmp, x, y);
cairo_matrix_translate(&c, -xt, -yt); cairo_matrix_translate(&tmp, -xt, -yt);
cairo_matrix_multiply(&c, &c, &tmp);
c2m(&c, m); c2m(&c, m);
} }
void uiDrawMatrixRotate(uiDrawMatrix *m, double x, double y, double amount) void uiDrawMatrixRotate(uiDrawMatrix *m, double x, double y, double amount)
{ {
cairo_matrix_t c; cairo_matrix_t c;
cairo_matrix_t tmp;
m2c(m, &c); m2c(m, &c);
cairo_matrix_translate(&c, x, y); cairo_matrix_init_translate(&tmp, x, y);
cairo_matrix_rotate(&c, amount); cairo_matrix_rotate(&tmp, amount);
cairo_matrix_translate(&c, -x, -y); cairo_matrix_translate(&tmp, -x, -y);
cairo_matrix_multiply(&c, &c, &tmp);
c2m(&c, m); c2m(&c, m);
} }