forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

additional fixes for #437, #436

This commit is contained in:
Vadim Lopatin 2017-09-13 16:59:06 +03:00
parent 2c346c015f
commit c616be0ad4
3 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dub.json
View File

@ -26,7 +26,7 @@
"-ddoxFilterArgs": ["--unittest-examples", "--min-protection=Protected", "--ex", "win32.", "-ddoxFilterArgs": ["--unittest-examples", "--min-protection=Protected", "--ex", "win32.",
"--ex", "dimage.", "--ex", "fontconfig", "--ex", "src.dlangui"], "--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/*"], "excludedSourceFiles-windows": ["3rdparty/fontconfig/*"],
"subPackages": [ "subPackages": [

24
src/dlangui/platforms/common/platform.d
View File

@ -275,16 +275,18 @@ class Window : CustomEventTarget {
return; return;
WindowState state = windowState; WindowState state = windowState;
Rect rect = windowRect; Rect rect = windowRect;
if (!rect.empty && if (state == WindowState.fullscreen
(state == WindowState.fullscreen
|| state == WindowState.minimized || state == WindowState.minimized
|| state == WindowState.maximized || state == WindowState.maximized
|| state == WindowState.normal)) { || state == WindowState.normal) {
// //
setting.setInteger("windowPositionLeft", rect.left); setting.setInteger("windowState", state);
setting.setInteger("windowPositionTop", rect.top); if (rect.right > 0 && rect.bottom > 0) {
setting.setInteger("windowWidth", rect.width); setting.setInteger("windowPositionLeft", rect.left);
setting.setInteger("windowHeight", rect.height); 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 rect;
rect.left = cast(int)setting.getInteger("windowPositionLeft", WindowState.unspecified); rect.left = cast(int)setting.getInteger("windowPositionLeft", WindowState.unspecified);
rect.top = cast(int)setting.getInteger("windowPositionTop", 0); rect.top = cast(int)setting.getInteger("windowPositionTop", 0);
int w = cast(int)setting.getInteger("windowPositionWidth", 0); int w = cast(int)setting.getInteger("windowWidth", 0);
int h = cast(int)setting.getInteger("windowPositionHeight", 0); int h = cast(int)setting.getInteger("windowHeight", 0);
if (w <= 0 || h <= 0) if (w <= 0 || h <= 0)
return false; return false;
rect.right = rect.left + w; rect.right = w;
rect.bottom = rect.top + h; rect.bottom = h;
if (correctWindowPositionOnScreen(rect) && (state == WindowState.fullscreen if (correctWindowPositionOnScreen(rect) && (state == WindowState.fullscreen
|| state == WindowState.minimized || state == WindowState.minimized
|| state == WindowState.maximized || state == WindowState.maximized

15
src/dlangui/platforms/windows/winapp.d
View File

@ -381,8 +381,10 @@ class Win32Window : Window {
return res; return res;
} }
protected bool _destroying;
~this() { ~this() {
debug Log.d("Window destructor"); debug Log.d("Window destructor");
_destroying = true;
if (_drawbuf) { if (_drawbuf) {
destroy(_drawbuf); destroy(_drawbuf);
_drawbuf = null; _drawbuf = null;
@ -645,6 +647,8 @@ class Win32Window : Window {
} }
override protected void handleWindowStateChange(WindowState newState, Rect newWindowRect = RECT_VALUE_IS_NOT_SET) { override protected void handleWindowStateChange(WindowState newState, Rect newWindowRect = RECT_VALUE_IS_NOT_SET) {
if (_destroying)
return;
super.handleWindowStateChange(newState, newWindowRect); super.handleWindowStateChange(newState, newWindowRect);
} }
@ -1414,7 +1418,16 @@ LRESULT WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
GetClientRect(hwnd, &rect); GetClientRect(hwnd, &rect);
int dx = rect.right - rect.left; int dx = rect.right - rect.left;
int dy = rect.bottom - rect.top; 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)); Rect(pos.x, pos.y, dx, dy));
if (window.width != dx || window.height != dy) { if (window.width != dx || window.height != dy) {
window.onResize(dx, dy); window.onResize(dx, dy);