Apply top and left margin correctly

livecodepanos · livecodepanos · commit 0b5548098ac6 · 2018-12-14T17:06:53.000+02:00
diff --git a/engine/src/desktop-stack.cpp b/engine/src/desktop-stack.cpp
@@ -233,8 +233,8 @@ MCRectangle MCStack::view_platform_getwindowrect() const
         MCscreen->platform_getwindowgeometry(window, t_content_rect);
         // the content rect of a window should always be contained (or equal) to the frame rect
         // so compute these 4 margins and then apply them to the rect of the stack
-        t_diff_rect.x = rect.x + (t_content_rect.x - t_frame_rect.x);
-        t_diff_rect.y = rect.y + (t_content_rect.y - t_frame_rect.y);
+        t_diff_rect.x = rect.x - (t_content_rect.x - t_frame_rect.x);
+        t_diff_rect.y = rect.y - (t_content_rect.y - t_frame_rect.y);
         t_diff_rect.width = rect.width + (t_frame_rect.width - t_content_rect.width);
         t_diff_rect.height = rect.height + (t_frame_rect.height - t_content_rect.height);
         return t_diff_rect;
diff --git a/engine/src/lnxstack.cpp b/engine/src/lnxstack.cpp
@@ -498,8 +498,8 @@ MCRectangle MCStack::view_device_getwindowrect(void) const
         MCscreen->platform_getwindowgeometry(window, t_content_rect);
         // the content rect of a window should always be contained (or equal) to the frame rect
         // so compute these 4 margins and then apply them to the rect of the stack
-        t_diff_rect.x = rect.x + (t_content_rect.x - t_frame_rect.x);
-        t_diff_rect.y = rect.y + (t_content_rect.y - t_frame_rect.y);
+        t_diff_rect.x = rect.x - (t_content_rect.x - t_frame_rect.x);
+        t_diff_rect.y = rect.y - (t_content_rect.y - t_frame_rect.y);
         t_diff_rect.width = rect.width + (t_frame_rect.width - t_content_rect.width);
         t_diff_rect.height = rect.height + (t_frame_rect.height - t_content_rect.height);
         return t_diff_rect;
diff --git a/engine/src/w32stack.cpp b/engine/src/w32stack.cpp
@@ -499,8 +499,8 @@ MCRectangle MCStack::view_platform_getwindowrect() const
         MCscreen->platform_getwindowgeometry((HWND)window->handle.window, t_content_rect);
         // the content rect of a window should always be contained (or equal) to the frame rect
         // so compute these 4 margins and then apply them to the rect of the stack
-        t_diff_rect.x = rect.x + (t_content_rect.x - t_frame_rect.x);
-        t_diff_rect.y = rect.y + (t_content_rect.y - t_frame_rect.y);
+        t_diff_rect.x = rect.x - (t_content_rect.x - t_frame_rect.x);
+        t_diff_rect.y = rect.y - (t_content_rect.y - t_frame_rect.y);
         t_diff_rect.width = rect.width + (t_frame_rect.width - t_content_rect.width);
         t_diff_rect.height = rect.height + (t_frame_rect.height - t_content_rect.height);
         return t_diff_rect;
