From 0faba4e3cb7b2dd41bd071704209f67462649ebd Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Wed, 28 Sep 2011 09:07:50 +0000 Subject: Mac only: further fine tuning in clipping/rectf needed for scroll demo after changes in r.9050. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9074 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_cocoa.mm | 2 +- src/fl_rect.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 760293a37..c15730d45 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -3348,7 +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) { - return CGRectMake(x, y, w-1, h-1); + return CGRectMake(x, y, w > 0 ? w - 0.9 : 0, h > 0 ? h - 0.9 : 0); } Window fl_xid(const Fl_Window* w) diff --git a/src/fl_rect.cxx b/src/fl_rect.cxx index 4a5606357..33a874856 100644 --- a/src/fl_rect.cxx +++ b/src/fl_rect.cxx @@ -188,7 +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__) - CGRect rect = CGRectMake(x, y, w - 1 , h - 1); + CGRect rect = CGRectMake(x, y, w - 0.9 , h - 0.9); CGContextFillRect(fl_gc, rect); #else # error unsupported platform -- cgit v1.2.3