From c616be0ad4165ac945b765c54dfe544805b4b4cf Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Wed, 13 Sep 2017 16:59:06 +0300
Subject: [PATCH] additional fixes for #437, #436

---
 dub.json                                |  2 +-
 src/dlangui/platforms/common/platform.d | 24 +++++++++++++-----------
 src/dlangui/platforms/windows/winapp.d  | 15 ++++++++++++++-
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/dub.json b/dub.json
index f40e4a3f..e1e4a067 100644
--- a/dub.json
+++ b/dub.json
@@ -26,7 +26,7 @@
     "-ddoxFilterArgs": ["--unittest-examples", "--min-protection=Protected", "--ex", "win32.",
         "--ex", "dimage.", "--ex", "fontconfig", "--ex", "src.dlangui"],
 
-    "sourceFiles-windows-dmd": ["$PACKAGE_DIR/src/win_app.def"],
+    "sourceFiles-windows-x86-dmd": ["$PACKAGE_DIR/src/win_app.def"],
     "excludedSourceFiles-windows": ["3rdparty/fontconfig/*"],
 
     "subPackages": [
diff --git a/src/dlangui/platforms/common/platform.d b/src/dlangui/platforms/common/platform.d
index 4983f8c1..a263f337 100644
--- a/src/dlangui/platforms/common/platform.d
+++ b/src/dlangui/platforms/common/platform.d
@@ -275,16 +275,18 @@ class Window : CustomEventTarget {
             return;
         WindowState state = windowState;
         Rect rect = windowRect;
-        if (!rect.empty && 
-            (state == WindowState.fullscreen 
+        if (state == WindowState.fullscreen 
             || state == WindowState.minimized 
             || state == WindowState.maximized
-            || state == WindowState.normal)) {
+            || state == WindowState.normal) {
             //
-            setting.setInteger("windowPositionLeft", rect.left);
-            setting.setInteger("windowPositionTop", rect.top);
-            setting.setInteger("windowWidth", rect.width);
-            setting.setInteger("windowHeight", rect.height);
+            setting.setInteger("windowState", state);
+            if (rect.right > 0 && rect.bottom > 0) {
+                setting.setInteger("windowPositionLeft", rect.left);
+                setting.setInteger("windowPositionTop", rect.top);
+                setting.setInteger("windowWidth", rect.right);
+                setting.setInteger("windowHeight", rect.bottom);
+            }
         }
     }
 
@@ -296,12 +298,12 @@ class Window : CustomEventTarget {
         Rect rect;
         rect.left = cast(int)setting.getInteger("windowPositionLeft", WindowState.unspecified);
         rect.top = cast(int)setting.getInteger("windowPositionTop", 0);
-        int w = cast(int)setting.getInteger("windowPositionWidth", 0);
-        int h = cast(int)setting.getInteger("windowPositionHeight", 0);
+        int w = cast(int)setting.getInteger("windowWidth", 0);
+        int h = cast(int)setting.getInteger("windowHeight", 0);
         if (w <= 0 || h <= 0)
             return false;
-        rect.right = rect.left + w;
-        rect.bottom = rect.top + h;
+        rect.right = w;
+        rect.bottom = h;
         if (correctWindowPositionOnScreen(rect) && (state == WindowState.fullscreen
              || state == WindowState.minimized 
              || state == WindowState.maximized
diff --git a/src/dlangui/platforms/windows/winapp.d b/src/dlangui/platforms/windows/winapp.d
index 8b47a6e3..68d34c4b 100644
--- a/src/dlangui/platforms/windows/winapp.d
+++ b/src/dlangui/platforms/windows/winapp.d
@@ -381,8 +381,10 @@ class Win32Window : Window {
         return res;
     }
 
+    protected bool _destroying;
     ~this() {
         debug Log.d("Window destructor");
+        _destroying = true;
         if (_drawbuf) {
             destroy(_drawbuf);
             _drawbuf = null;
@@ -645,6 +647,8 @@ class Win32Window : Window {
     }
     
     override protected void handleWindowStateChange(WindowState newState, Rect newWindowRect = RECT_VALUE_IS_NOT_SET) {
+        if (_destroying)
+            return;
         super.handleWindowStateChange(newState, newWindowRect);
     }
 
@@ -1414,7 +1418,16 @@ LRESULT WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                         GetClientRect(hwnd, &rect);
                         int dx = rect.right - rect.left;
                         int dy = rect.bottom - rect.top;
-                        window.handleWindowStateChange( IsZoomed(hwnd) ? WindowState.maximized : IsWindowVisible(hwnd) ? WindowState.normal : WindowState.hidden,
+                        WindowState state = WindowState.unspecified;
+                        if (IsZoomed(hwnd))
+                            state = WindowState.maximized;
+                        else if (IsIconic(hwnd))
+                            state = WindowState.minimized;
+                        else if (IsWindowVisible(hwnd))
+                            state = WindowState.normal;
+                        else
+                            state = WindowState.hidden;
+                        window.handleWindowStateChange(state,
                             Rect(pos.x, pos.y, dx, dy));
                         if (window.width != dx || window.height != dy) {
                             window.onResize(dx, dy);