uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

FIx bug where WM_Raise doesn't raise children if the parent is raised.

Browse source
This commit is contained in:
Andrew Hannam 2016-07-25 19:26:28 +10:00
parent 9fe1abe9e3
commit dded46b567
1 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/gwin/gwin_wm.c
View file

@ -988,6 +988,35 @@ static void WM_Raise(GHandle gh) {
gfxQueueASyncRemove(&_GWINList, &gh->wmq); gfxQueueASyncRemove(&_GWINList, &gh->wmq);
gfxQueueASyncPut(&_GWINList, &gh->wmq); gfxQueueASyncPut(&_GWINList, &gh->wmq);
#if GWIN_NEED_CONTAINERS
// Any children need to be moved
if ((gh->flags & GWIN_FLG_CONTAINER)) {
GHandle child;
bool_t restart;
// Raise the children too.
// Note children can also have their own children so after each move required we have to start again.
for(gh = gwinGetNextWindow(0); gh; gh = gwinGetNextWindow(gh)) {
if ((gh->flags & GWIN_FLG_CONTAINER)) {
restart = FALSE;
for(child = gwinGetNextWindow(0); child && child != gh; child = gwinGetNextWindow(child)) {
if (child->parent == gh) {
// Oops - this child is behind its parent
gfxQueueASyncRemove(&_GWINList, &child->wmq);
gfxQueueASyncPut(&_GWINList, &child->wmq);
// Continue the loop here effectively restarts at the front of the list
// for this parent container as we have moved this child to the start of the list.
// We also need to restart everything once this container is done.
restart = TRUE;
}
}
if (restart)
gh = 0;
}
}
}
#endif
// Redraw the window // Redraw the window
_gwinUpdate(gh); _gwinUpdate(gh);
} }