[19277] Ensure the effective rect is fetched correctly when screen is locked

livecodepanos · livecodepanos · commit b7cbc7ef4135 · 2018-12-05T12:43:28.000Z
diff --git a/engine/src/desktop-stack.cpp b/engine/src/desktop-stack.cpp
@@ -225,9 +225,18 @@ void MCStack::realize(void)
 
 MCRectangle MCStack::view_platform_getwindowrect() const
 {
-	MCRectangle t_rect;
-	MCPlatformGetWindowFrameRect(window, t_rect);
-	return t_rect;
+    MCRectangle t_frame_rect;
+	MCPlatformGetWindowFrameRect(window, t_frame_rect);
+    if (MClockscreen != 0)
+    {
+        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);
+        return t_diff_rect;
+    }
+    
+    return t_frame_rect;
+	
 }
 
 bool MCStack::view_platform_dirtyviewonresize() const
diff --git a/engine/src/lnxstack.cpp b/engine/src/lnxstack.cpp
@@ -489,7 +489,18 @@ MCRectangle MCStack::view_device_getwindowrect(void) const
 {
     GdkRectangle t_frame;
     gdk_window_get_frame_extents(window, &t_frame);
-    return MCRectangleMake(t_frame . x, t_frame . y, t_frame . width, t_frame . height);
+    MCRectangle t_frame_rect;
+    t_frame_rect = MCRectangleMake(t_frame . x, t_frame . y, t_frame . width, t_frame . height);
+    
+    if (MClockscreen != 0)
+    {
+        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);
+        return t_diff_rect;
+    }
+    
+    return t_frame_rect;
 }
 
 // IM-2014-01-29: [[ HiDPI ]] Placeholder method for Linux HiDPI support
diff --git a/engine/src/w32stack.cpp b/engine/src/w32stack.cpp
@@ -487,13 +487,21 @@ MCRectangle MCStack::view_platform_getwindowrect() const
 	RECT wrect;
 	GetWindowRect((HWND)window->handle.window, &wrect);
 
-	MCRectangle t_rect;
-	t_rect = MCRectangleFromWin32RECT(wrect);
-
-	// IM-2014-01-28: [[ HiDPI ]] Convert screen to logical coords
-	t_rect = MCscreen->screentologicalrect(t_rect);
-
-	return t_rect;
+	MCRectangle t_frame_rect;
+	t_frame_rect = MCRectangleFromWin32RECT(wrect);
+    
+    // IM-2014-01-28: [[ HiDPI ]] Convert screen to logical coords
+    t_frame_rect = MCscreen->screentologicalrect(t_frame_rect);
+    
+    if (MClockscreen != 0)
+    {
+        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);
+        return t_diff_rect;
+    }
+    
+	return t_frame_rect;
 }
 
 // IM-2013-09-23: [[ FullscreenMode ]] Factor out device-specific window sizing
