STR #1729: fixed ovelay offset for Quartz rendering

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@6003 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

2 files changed, 3 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index 0d358f598..ed1c01d55 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ CHANGES IN FLTK 1.1.8
 	  STR #1457, STR #1458, STR #1460, STR #1481, STR #1578,
 	  STR #1639, STR #1645, STR #1644, STR #1792, STR #1793,
 	  STR #1742, STR #1777, STR #1794, STR #1827, STR #1843)
+	- Fixed overlay offset for OS X Quartz (STR #1729)
 	- gl_font() support for Xft+X11 (STR #1809)
 	- Fl_Gl_Window::mode() needed to hide and show the window
 	  when toggling stereo mode (STR #1846)
diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx
index 48f22a27f..93f7bca61 100644
--- a/src/Fl_mac.cxx
+++ b/src/Fl_mac.cxx
@@ -2235,8 +2235,8 @@ void Fl_X::q_begin_image(CGRect &rect, int cx, int cy, int w, int h) {
   CGContextClipToRect(fl_gc, r2);
   mx.d = -1.0; mx.tx = -mx.tx;
   CGContextConcatCTM(fl_gc, mx);
-  rect.origin.x = rect.origin.x - cx;
-  rect.origin.y = (mx.ty+0.5f) - rect.origin.y - h + cy;
+  rect.origin.x = -(mx.tx+0.5f) + rect.origin.x     - cx;
+  rect.origin.y =  (mx.ty+0.5f) - rect.origin.y - h + cy;
   rect.size.width = w;
   rect.size.height = h;
 }