From 92c5916e56c11b7837e8fa6fafe2e5a84e6e046e Mon Sep 17 00:00:00 2001
From: "Adam D. Ruppe" <destructionator@gmail.com>
Date: Mon, 1 Aug 2016 16:32:36 -0400
Subject: [PATCH] fix resize on Windows

---
 simpledisplay.d | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/simpledisplay.d b/simpledisplay.d
index bad2a3b..521278f 100644
--- a/simpledisplay.d
+++ b/simpledisplay.d
@@ -3676,19 +3676,39 @@ version(Windows) {
 		void move (int x, int y) {
 			RECT rect;
 			GetWindowRect(hwnd, &rect);
-			MoveWindow(hwnd, x, y, rect.right, rect.bottom, true);
+			// move it while maintaining the same size...
+			MoveWindow(hwnd, x, y, rect.right - rect.left + x, rect.bottom - rect.top + y, true);
 		}
 
 		void resize (int w, int h) {
 			RECT rect;
 			GetWindowRect(hwnd, &rect);
-			MoveWindow(hwnd, rect.left, rect.top, w, h, true);
+
+			RECT client;
+			GetClientRect(hwnd, &client);
+
+			rect.right = rect.right - client.right + w;
+			rect.bottom = rect.bottom - client.bottom + w;
+
+			// same position, new size for the client rectangle
+			MoveWindow(hwnd, rect.left, rect.top, rect.right, rect.bottom, true);
+
 			version(without_opengl) {} else
 			glViewport(0, 0, w, h);
 		}
 
 		void moveResize (int x, int y, int w, int h) {
-			MoveWindow(hwnd, x, y, w, h, true);
+			// what's given is the client rectangle, we need to adjust
+
+			RECT rect;
+			rect.left = x;
+			rect.top = y;
+			rect.right = w;
+			rect.bottom = y;
+			if(!AdjustWindowRect(&rect, GetWindowLong(hwnd, GWL_STYLE), GetMenu(hwnd) !is null))
+				throw new Exception("AdjustWindowRect");
+
+			MoveWindow(hwnd, rect.left, rect.top, rect.right, rect.bottom, true);
 			version(without_opengl) {} else
 			glViewport(0, 0, w, h);
 			if (windowResized !is null) windowResized(w, h);