(nut-tree/nut.js#249) Refactor scale calculation to work correctly with custom regions

Author: s1hofmann

src/win32/screengrab.c

@@ -3,19 +3,23 @@
 #include <stdlib.h> /* malloc() */
 
 MMRect getScaledRect(MMRect input, HDC imageSource) {
+	// Configure DPI awareness to fetch unscaled display size
+	DPI_AWARENESS_CONTEXT initialDpiAwareness = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
+	size_t scaledDesktopWidth = (size_t)GetSystemMetrics(SM_CXSCREEN);
+	size_t scaledDesktopHeight = (size_t)GetSystemMetrics(SM_CYSCREEN);
+	// Reset DPI awareness to avoid inconsistencies on future calls to copyMMBitmapFromDisplayInRect
+	SetThreadDpiAwarenessContext(initialDpiAwareness);
 	size_t desktopWidth = (size_t)GetSystemMetrics(SM_CXSCREEN);
 	size_t desktopHeight = (size_t)GetSystemMetrics(SM_CYSCREEN);
 
-	double scaleX = (double)(desktopWidth / (double)input.size.width);
-	double scaleY = (double)(desktopHeight / (double)input.size.height);
+	double scaleX = (double)(desktopWidth / (double)scaledDesktopWidth);
+	double scaleY = (double)(desktopHeight / (double)scaledDesktopHeight);
 
 	return MMRectMake(input.origin.x, input.origin.y, input.size.width * scaleX, input.size.height * scaleY);
 }
 
 MMBitmapRef copyMMBitmapFromDisplayInRect(MMRect rect)
 {
-	// Configure DPI awareness to fetch unscaled display size
-	DPI_AWARENESS_CONTEXT initialDpiAwareness = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
 	MMBitmapRef bitmap;
 	void *data;
 	HDC screen = NULL, screenMem = NULL;
@@ -80,8 +84,6 @@ MMBitmapRef copyMMBitmapFromDisplayInRect(MMRect rect)
 	ReleaseDC(NULL, screen);
 	DeleteObject(dib);
 	DeleteDC(screenMem);
-	// Reset DPI awareness to avoid inconsistencies on future calls to copyMMBitmapFromDisplayInRect
-	SetThreadDpiAwarenessContext(initialDpiAwareness);
 
 	return bitmap;
 }