suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Mac problem with clipping constructed with paths and transform + scale

Browse Source 
Merge to v5.0
This commit is contained in:
Matthew Flatt 2010-05-28 16:54:25 -06:00
parent f94b727118
commit 83ed233125
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/wxcommon/Region.cxx
View File

@ -18,6 +18,7 @@ typedef struct {
# define PathTargetPath_t CGMutablePathRef # define PathTargetPath_t CGMutablePathRef
# define CGXFORM (&current_xform) # define CGXFORM (&current_xform)
# define PATHPATH ((CGMutablePathRef)target) # define PATHPATH ((CGMutablePathRef)target)
static int path_install_use_xform; /* ugly back-door argument */
#endif #endif
#ifdef wx_msw #ifdef wx_msw
@ -1654,6 +1655,7 @@ Bool wxPathPathRgn::Install(long target, Bool reverse, Bool align)
q->Install(target, 0, 0, 0, 0, 1, 1, FALSE, 0, 0); q->Install(target, 0, 0, 0, 0, 1, 1, FALSE, 0, 0);
#endif #endif
#ifdef wx_mac #ifdef wx_mac
path_install_use_xform = 1;
q->Install((long)CGPATH, 0, 0, 0, 0, 1, 1, FALSE, 0, 0); q->Install((long)CGPATH, 0, 0, 0, 0, 1, 1, FALSE, 0, 0);
#endif #endif
#ifdef wx_msw #ifdef wx_msw
@ -2373,6 +2375,15 @@ void wxPath::Install(long target, double dx, double dy,
{ {
int i = 0; int i = 0;
double lx = 0.0, ly = 0.0, lxx = 0.0, lyy = 0.0; double lx = 0.0, ly = 0.0, lxx = 0.0, lyy = 0.0;
#ifdef wx_mac
const CGAffineTransform *xform;
if (path_install_use_xform) {
xform = CGXFORM;
path_install_use_xform = 0;
} else
xform = NULL;
#endif
#ifdef WX_USE_CAIRO #ifdef WX_USE_CAIRO
cairo_new_path(CAIRO_DEV); cairo_new_path(CAIRO_DEV);
@ -2403,7 +2414,7 @@ void wxPath::Install(long target, double dx, double dy,
cairo_move_to(CAIRO_DEV, xx, yy); cairo_move_to(CAIRO_DEV, xx, yy);
#endif #endif
#ifdef wx_mac #ifdef wx_mac
CGPathMoveToPoint(PATHPATH, NULL, xx, yy); CGPathMoveToPoint(PATHPATH, xform, xx, yy);
#endif #endif
lx = cmds[i+1]; lx = cmds[i+1];
@ -2426,7 +2437,7 @@ void wxPath::Install(long target, double dx, double dy,
cairo_line_to(CAIRO_DEV, xx, yy); cairo_line_to(CAIRO_DEV, xx, yy);
#endif #endif
#ifdef wx_mac #ifdef wx_mac
CGPathAddLineToPoint(PATHPATH, NULL, xx, yy); CGPathAddLineToPoint(PATHPATH, xform, xx, yy);
#endif #endif
#ifdef wx_msw #ifdef wx_msw
wxGPathAddLine(PATH_GP, lxx, lyy, xx, yy); wxGPathAddLine(PATH_GP, lxx, lyy, xx, yy);
@ -2457,7 +2468,7 @@ void wxPath::Install(long target, double dx, double dy,
cairo_curve_to(CAIRO_DEV, xx1, yy1, xx2, yy2, xx, yy); cairo_curve_to(CAIRO_DEV, xx1, yy1, xx2, yy2, xx, yy);
#endif #endif
#ifdef wx_mac #ifdef wx_mac
CGPathAddCurveToPoint(PATHPATH, NULL, xx1, yy1, xx2, yy2, xx, yy); CGPathAddCurveToPoint(PATHPATH, xform, xx1, yy1, xx2, yy2, xx, yy);
#endif #endif
#ifdef wx_msw #ifdef wx_msw
wxGPathAddBezier(PATH_GP, lxx, lyy, xx1, yy1, xx2, yy2, xx, yy); wxGPathAddBezier(PATH_GP, lxx, lyy, xx1, yy1, xx2, yy2, xx, yy);