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

implement closeQuery on Windows

This commit is contained in:
Adam D. Ruppe 2018-11-14 11:45:07 -05:00
parent 58ba664255
commit 168b165455
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
simpledisplay.d
View File

@ -1427,7 +1427,7 @@ class SimpleWindow : CapableOfHandlingNativeEvent, CapableOfBeingDrawnUpon {
/// This will be called when WM wants to close your window (i.e. user clicked "close" icon, for example). /// This will be called when WM wants to close your window (i.e. user clicked "close" icon, for example).
/// You'll have to call `close()` manually if you set this delegate. /// You'll have to call `close()` manually if you set this delegate.
version(X11) void delegate () closeQuery; void delegate () closeQuery;
/// This will be called when window visibility was changed. /// This will be called when window visibility was changed.
void delegate (bool becomesVisible) visibilityChanged; void delegate (bool becomesVisible) visibilityChanged;
@ -7986,7 +7986,7 @@ version(Windows) {
//break; //break;
case WM_CLOSE: case WM_CLOSE:
DestroyWindow(hwnd); if (this.closeQuery !is null) this.closeQuery(); else this.close();
break; break;
case WM_DESTROY: case WM_DESTROY:
if (this.onDestroyed !is null) try { this.onDestroyed(); } catch (Exception e) {} // sorry if (this.onDestroyed !is null) try { this.onDestroyed(); } catch (Exception e) {} // sorry
@ -9915,7 +9915,6 @@ version(X11) {
} }
} else if(e.xclient.data.l[0] == GetAtom!"WM_DELETE_WINDOW"(e.xany.display)) { } else if(e.xclient.data.l[0] == GetAtom!"WM_DELETE_WINDOW"(e.xany.display)) {
// user clicked the close button on the window manager // user clicked the close button on the window manager
// FIXME: not implemented on Windows
if(auto win = e.xclient.window in SimpleWindow.nativeMapping) { if(auto win = e.xclient.window in SimpleWindow.nativeMapping) {
XUnlockDisplay(display); XUnlockDisplay(display);
scope(exit) XLockDisplay(display); scope(exit) XLockDisplay(display);