gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simpler coding of the half-pixel offset necessary when clipping to a rectangle.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10533 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2015-01-24 12:54:21 +00:00
parent 6f022c4d95
commit ed547c6c63
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Fl_cocoa.mm
View File

@ -2979,7 +2979,6 @@ void Fl_X::make(Fl_Window* w)
if (!CGRectContainsRect(prect, srect)) { // if subwindow extends outside its parent window
CGRect clip = CGRectIntersection(prect, srect);
clip = CGRectOffset(clip, -w->x(), -w->y());
clip = fl_cgrectmake_cocoa(clip.origin.x, clip.origin.y, clip.size.width, clip.size.height);
x->subRect(new CGRect(clip));
}
set_subwindow_frame(w);
@ -3175,7 +3174,7 @@ void Fl_Window::resize(int X,int Y,int W,int H) {
[[i->xid contentView] setNeedsDisplay:YES]; // subwindow needs redrawn
if (CGRectEqualToRect(srect, full)) r = NULL;
else {
r = new CGRect(fl_cgrectmake_cocoa(srect.origin.x, srect.origin.y, srect.size.width, srect.size.height));
r = new CGRect(srect);
}
i->subRect(r);
}
@ -3233,7 +3232,8 @@ void Fl_Window::make_current()
CGContextTranslateCTM(fl_gc, 0.5, hgt-0.5f);
CGContextScaleCTM(fl_gc, 1.0f, -1.0f); // now 0,0 is top-left point of the window
// for subwindows, limit drawing to inside of parent window
if (i->subRect()) CGContextClipToRect(fl_gc, *(i->subRect()));
// half pixel offset is necessary for clipping as done by fl_cgrectmake_cocoa()
if (i->subRect()) CGContextClipToRect(fl_gc, CGRectOffset(*(i->subRect()), -0.5, -0.5));
// this is the context with origin at top left of (sub)window
CGContextSaveGState(fl_gc);