[19277] Compute effective rect of stack correctly

livecodepanos · livecodepanos · commit 97ccfd489ab4 · 2018-12-05T13:38:11.000Z
diff --git a/engine/src/desktop-stack.cpp b/engine/src/desktop-stack.cpp
@@ -231,7 +231,12 @@ MCRectangle MCStack::view_platform_getwindowrect() const
     {
         MCRectangle t_content_rect, t_diff_rect;
         MCscreen->platform_getwindowgeometry(window, t_content_rect);
-        t_diff_rect = MCU_subtract_rect(t_content_rect, t_frame_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.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
@@ -496,7 +496,12 @@ MCRectangle MCStack::view_device_getwindowrect(void) const
     {
         MCRectangle t_content_rect, t_diff_rect;
         MCscreen->platform_getwindowgeometry(window, t_content_rect);
-        t_diff_rect = MCU_subtract_rect(t_content_rect, t_frame_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.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
@@ -497,7 +497,12 @@ MCRectangle MCStack::view_platform_getwindowrect() const
     {
         MCRectangle t_content_rect, t_diff_rect;
         MCscreen->platform_getwindowgeometry((HWND)window->handle.window, t_content_rect);
-        t_diff_rect = MCU_subtract_rect(t_content_rect, t_frame_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.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;
     }
     

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,12 @@ MCRectangle MCStack::view_platform_getwindowrect() const`
`231`	`231`	`{`
`232`	`232`	`MCRectangle t_content_rect, t_diff_rect;`
`233`	`233`	`MCscreen->platform_getwindowgeometry(window, t_content_rect);`
`234`		`- t_diff_rect = MCU_subtract_rect(t_content_rect, t_frame_rect);`
	`234`	`+ // the content rect of a window should always be contained (or equal) to the frame rect`
	`235`	`+ // so compute these 4 margins and then apply them to the rect of the stack`
	`236`	`+ t_diff_rect.x = rect.x + (t_content_rect.x - t_frame_rect.x);`
	`237`	`+ t_diff_rect.y = rect.y + (t_content_rect.y - t_frame_rect.y);`
	`238`	`+ t_diff_rect.width = rect.width + (t_frame_rect.width - t_content_rect.width);`
	`239`	`+ t_diff_rect.height = rect.height + (t_frame_rect.height - t_content_rect.height);`
`235`	`240`	`return t_diff_rect;`
`236`	`241`	`}`
`237`	`242`
Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,12 @@ MCRectangle MCStack::view_device_getwindowrect(void) const`
`496`	`496`	`{`
`497`	`497`	`MCRectangle t_content_rect, t_diff_rect;`
`498`	`498`	`MCscreen->platform_getwindowgeometry(window, t_content_rect);`
`499`		`- t_diff_rect = MCU_subtract_rect(t_content_rect, t_frame_rect);`
	`499`	`+ // the content rect of a window should always be contained (or equal) to the frame rect`
	`500`	`+ // so compute these 4 margins and then apply them to the rect of the stack`
	`501`	`+ t_diff_rect.x = rect.x + (t_content_rect.x - t_frame_rect.x);`
	`502`	`+ t_diff_rect.y = rect.y + (t_content_rect.y - t_frame_rect.y);`
	`503`	`+ t_diff_rect.width = rect.width + (t_frame_rect.width - t_content_rect.width);`
	`504`	`+ t_diff_rect.height = rect.height + (t_frame_rect.height - t_content_rect.height);`
`500`	`505`	`return t_diff_rect;`
`501`	`506`	`}`
`502`	`507`
Original file line number	Diff line number	Diff line change
`@@ -497,7 +497,12 @@ MCRectangle MCStack::view_platform_getwindowrect() const`
`497`	`497`	`{`
`498`	`498`	`MCRectangle t_content_rect, t_diff_rect;`
`499`	`499`	`MCscreen->platform_getwindowgeometry((HWND)window->handle.window, t_content_rect);`
`500`		`- t_diff_rect = MCU_subtract_rect(t_content_rect, t_frame_rect);`
	`500`	`+ // the content rect of a window should always be contained (or equal) to the frame rect`
	`501`	`+ // so compute these 4 margins and then apply them to the rect of the stack`
	`502`	`+ t_diff_rect.x = rect.x + (t_content_rect.x - t_frame_rect.x);`
	`503`	`+ t_diff_rect.y = rect.y + (t_content_rect.y - t_frame_rect.y);`
	`504`	`+ t_diff_rect.width = rect.width + (t_frame_rect.width - t_content_rect.width);`
	`505`	`+ t_diff_rect.height = rect.height + (t_frame_rect.height - t_content_rect.height);`
`501`	`506`	`return t_diff_rect;`
`502`	`507`	`}`
`503`	`508`