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

Merge pull request #341 from and3md/fix_window_close 

Fix window close in SDL
This commit is contained in:
Vadim Lopatin 2017-05-02 11:24:36 +03:00 committed by GitHub
parent 43e2d8bdab a8db8a6e5a
commit 3c72624f52
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/dlangui/platforms/sdl/sdlapp.d
View File

@ -74,6 +74,7 @@ private derelict.util.exception.ShouldThrow missingSymFunc( string symName ) {
private __gshared uint USER_EVENT_ID; private __gshared uint USER_EVENT_ID;
private __gshared uint TIMER_EVENT_ID; private __gshared uint TIMER_EVENT_ID;
private __gshared uint WINDOW_CLOSE_EVENT_ID;
class SDLWindow : Window { class SDLWindow : Window {
SDLPlatform _platform; SDLPlatform _platform;
@ -1112,12 +1113,14 @@ class SDLPlatform : Platform {
return null; return null;
} }
SDLWindow _windowToClose;
/// close window /// close window
override void closeWindow(Window w) { override void closeWindow(Window w) {
SDLWindow window = cast(SDLWindow)w; SDLWindow window = cast(SDLWindow)w;
_windowToClose = window; SDL_Event sdlevent;
sdlevent.user.type = WINDOW_CLOSE_EVENT_ID;
sdlevent.user.code = 0;
sdlevent.user.windowID = window.windowId;
SDL_PushEvent(&sdlevent);
} }
/// calls request layout for all windows /// calls request layout for all windows
@ -1382,19 +1385,19 @@ class SDLPlatform : Platform {
if (w) { if (w) {
w.handleTimer(cast(uint)event.user.code); w.handleTimer(cast(uint)event.user.code);
} }
} else if (event.type == WINDOW_CLOSE_EVENT_ID) {
SDLWindow windowToClose = getWindow(event.user.windowID);
if(windowToClose) {
if (windowToClose.windowId in _windowMap) {
Log.i("Platform.closeWindow()");
_windowMap.remove(windowToClose.windowId);
Log.i("windowMap.length=", _windowMap.length);
destroy(windowToClose);
}
}
} }
break; break;
} }
if (_windowToClose) {
if (_windowToClose.windowId in _windowMap) {
Log.i("Platform.closeWindow()");
_windowMap.remove(_windowToClose.windowId);
SDL_DestroyWindow(_windowToClose._win);
Log.i("windowMap.length=", _windowMap.length);
destroy(_windowToClose);
}
_windowToClose = null;
}
if (_windowMap.length == 0) { if (_windowMap.length == 0) {
SDL_Quit(); SDL_Quit();
quit = true; quit = true;
@ -1989,6 +1992,7 @@ int sdlmain(string[] args) {
USER_EVENT_ID = SDL_RegisterEvents(1); USER_EVENT_ID = SDL_RegisterEvents(1);
TIMER_EVENT_ID = SDL_RegisterEvents(1); TIMER_EVENT_ID = SDL_RegisterEvents(1);
WINDOW_CLOSE_EVENT_ID = SDL_RegisterEvents(1);
int request = SDL_GetDesktopDisplayMode(0, &displayMode); int request = SDL_GetDesktopDisplayMode(0, &displayMode);