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

X11: Redesigned hasModalWindowsAbove(), fixed crash after close second window.

This commit is contained in:
and3md 2017-10-07 17:00:36 +02:00
parent 23913e73f3
commit 903aba9c5a
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/dlangui/platforms/x11/x11app.d
View File

@ -440,6 +440,14 @@ class X11Window : DWindow {
} }
} }
private bool hasVisibleModalChild() {
foreach (X11Window w;_children) {
if (w.flags & WindowFlag.Modal && w._windowState != WindowState.hidden)
return true;
}
return false;
}
/// show window /// show window
override void show() { override void show() {
Log.d("X11Window.show"); Log.d("X11Window.show");
@ -1237,7 +1245,6 @@ class X11Platform : Platform {
} }
private X11Window[XWindow] _windowMap; private X11Window[XWindow] _windowMap;
private X11Window[] _windowList;
/** /**
* create window * create window
@ -1255,7 +1262,6 @@ class X11Platform : Platform {
int newheight = height; int newheight = height;
X11Window window = new X11Window(this, windowCaption, parent, flags, newwidth, newheight); X11Window window = new X11Window(this, windowCaption, parent, flags, newwidth, newheight);
_windowMap[window._win] = window; _windowMap[window._win] = window;
_windowList ~= window;
return window; return window;
} }
@ -1284,17 +1290,6 @@ class X11Platform : Platform {
XSendEvent(x11display2, window._win, false, StructureNotifyMask, &ev); XSendEvent(x11display2, window._win, false, StructureNotifyMask, &ev);
XFlush(x11display2); XFlush(x11display2);
XUnlockDisplay(x11display2); XUnlockDisplay(x11display2);
for (uint i = 0; i < _windowList.length; i++) {
if (w is _windowList[i]) {
for (uint j = i; j + 1 < _windowList.length; j++)
_windowList[j] = _windowList[j + 1];
_windowList[$ - 1] = null;
_windowList.length--;
break;
}
}
} }
bool handleTimers() { bool handleTimers() {
@ -1780,15 +1775,9 @@ class X11Platform : Platform {
/// returns true if there is some modal window opened above this window, and this window should not process mouse/key input and should not allow closing /// returns true if there is some modal window opened above this window, and this window should not process mouse/key input and should not allow closing
override bool hasModalWindowsAbove(DWindow w) { override bool hasModalWindowsAbove(DWindow w) {
// override in platform specific class X11Window x11Win = cast (X11Window) w;
for (uint i = 0; i + 1 < _windowList.length; i++) { if (x11Win) {
if (_windowList[i] is w) { return x11Win.hasVisibleModalChild();
for (uint j = i + 1; j < _windowList.length; j++) {
if (_windowList[j].flags & WindowFlag.Modal && _windowList[j].windowState != WindowState.hidden)
return true;
}
return false;
}
} }
return false; return false;
} }