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

Fix the window manager to reveal windows behind a window that is made invisible.

Browse source
This commit is contained in:
inmarket 2014-08-16 22:51:59 +10:00
parent 5dd9e1dc35
commit 0fc1d5f033
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/gwin/gwm.c
View file

@ -634,9 +634,6 @@ static void WM_Redraw(GHandle gh) {
gh->vmt->AfterClear(gh); gh->vmt->AfterClear(gh);
} }
// A real window manager would also redraw frame borders here for top level windows
// For non-top level windows their parent is responsible for any borders
// Redraw is done // Redraw is done
gh->flags &= ~(GWIN_FLG_NEEDREDRAW|GWIN_FLG_BGREDRAW|GWIN_FLG_PARENTREVEAL); gh->flags &= ~(GWIN_FLG_NEEDREDRAW|GWIN_FLG_BGREDRAW|GWIN_FLG_PARENTREVEAL);
@ -651,6 +648,8 @@ static void WM_Redraw(GHandle gh) {
#endif #endif
} else { } else {
if ((gh->flags & GWIN_FLG_BGREDRAW)) { if ((gh->flags & GWIN_FLG_BGREDRAW)) {
GHandle gx;
#if GWIN_NEED_CONTAINERS #if GWIN_NEED_CONTAINERS
if (gh->parent) { if (gh->parent) {
// Child redraw is done // Child redraw is done
@ -662,7 +661,22 @@ static void WM_Redraw(GHandle gh) {
goto redo_redraw; goto redo_redraw;
} }
#endif #endif
// Clear the area to the background color
gdispGFillArea(gh->display, gh->x, gh->y, gh->width, gh->height, gwinGetDefaultBgColor()); gdispGFillArea(gh->display, gh->x, gh->y, gh->width, gh->height, gwinGetDefaultBgColor());
// Now loop over all windows looking for overlaps. Redraw them if they overlap the newly exposed area.
for(gx = gwinGetNextWindow(0); gx; gx = gwinGetNextWindow(gx)) {
if ((gx->flags & GWIN_FLG_SYSVISIBLE)
&& gx->display == gh->display
&& gx->x < gh->x+gh->width && gx->y < gh->y+gh->height && gx->x+gx->width >= gh->x && gx->y+gx->height >= gh->y) {
if (gx->vmt->Redraw)
gx->vmt->Redraw(gx);
else
// We can't redraw this window but we want full coverage so just clear the area
gdispGFillArea(gx->display, gx->x, gx->y, gx->width, gx->height, gx->bgcolor);
}
}
} }
// Redraw is done // Redraw is done