Fixed issue of Windows not accounting for window frame sizes

ZILtoid1991 · Nov 14, 2024 · 7228a41 · 7228a41
1 parent 34423e3
commit 7228a41
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.4.0-beta.2
+
+* Fixed an issue with Windows not accounting for the frames when creating a window.
+
 # 0.4.0-beta
 
 * Fixed a bug that caused x11 to lock up until new event is generated.

diff --git a/source/iota/window/oswindow.d b/source/iota/window/oswindow.d
@@ -354,14 +354,17 @@ public class OSWindow {
 			if (x <= 0) x = CW_USEDEFAULT;
 			if (y <= 0) y = CW_USEDEFAULT;
 			if (w <= 0) w = CW_USEDEFAULT;
-			else if ((flags & WindowCfgFlags.NoDecorations) == 0) w += GetSystemMetrics(SM_CXSIZEFRAME);
+			// else if ((flags & WindowCfgFlags.NoDecorations) == 0) w += GetSystemMetrics(SM_CXSIZEFRAME);
 			if (h <= 0) h = CW_USEDEFAULT;
-			else if ((flags & WindowCfgFlags.NoDecorations) == 0) h += GetSystemMetrics(SM_CYSIZEFRAME);
+			// else if ((flags & WindowCfgFlags.NoDecorations) == 0) h += GetSystemMetrics(SM_CYSIZEFRAME);
+			RECT windowRect = RECT(0,0,w,h);
+			AdjustWindowRect(&windowRect, dwStyle, FALSE);
 			windowname = toUTF16z(title);
 			HWND parentHndl = null;
 			if (parent !is null)
 				parentHndl = parent.getHandle();
-			windowHandle = CreateWindowW(classname, windowname, dwStyle, x, y, w, h, parentHndl, null, mainInst, null);
+			windowHandle = CreateWindowW(classname, windowname, dwStyle, x, y, windowRect.right - windowRect.left,
+					windowRect.bottom - windowRect.top, parentHndl, null, mainInst, null);
 			if (!windowHandle) {
 				auto errorCode = GetLastError();
 				throw new WindowCreationException("Failed to create window!", errorCode);