mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mac OS: simplified use of CGRectMake() for rectangle drawing and clipping on display and printer.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9050 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2011-09-19 19:03:22 +00:00
parent 1eb3664e7a
commit bdb000bf2f
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Fl_cocoa.mm
View File

@ -3348,8 +3348,7 @@ WindowRef Fl_X::window_ref()
// so a CGRect matches exactly what is denoted x,y,w,h for clipping purposes
CGRect fl_cgrectmake_cocoa(int x, int y, int w, int h) {
if (Fl_Surface_Device::surface()->class_name() == Fl_Printer::class_id) return CGRectMake(x-0.5, y-0.5, w, h);
return CGRectMake(x, y, w > 0 ? w - 0.9 : 0, h > 0 ? h - 0.9 : 0);
return CGRectMake(x, y, w-1, h-1);
}
Window fl_xid(const Fl_Window* w)

8
src/fl_rect.cxx
View File

@ -188,13 +188,7 @@ void Fl_Graphics_Driver::rectf(int x, int y, int w, int h) {
rect.right = x + w; rect.bottom = y + h;
FillRect(fl_gc, &rect, fl_brush());
#elif defined(__APPLE_QUARTZ__)
CGFloat delta_size = 0.9;
CGFloat delta_ori = 0;
if (USINGQUARTZPRINTER) {
delta_size = 0;
delta_ori = 0.5;
}
CGRect rect = CGRectMake(x - delta_ori, y - delta_ori, w - delta_size , h - delta_size);
CGRect rect = CGRectMake(x, y, w - 1 , h - 1);
CGContextFillRect(fl_gc, rect);
#else
# error unsupported platform