dix: Outdent Unmap{Window,Subwindows} a bit

No functional change, just folding some conditionals together.
This commit is contained in:
Adam Jackson 2019-03-06 17:03:58 -05:00 committed by Adam Jackson
parent 74479a99ec
commit 3904216b01

View File

@ -2856,14 +2856,12 @@ UnmapWindow(WindowPtr pWin, Bool fromConfigure)
pWin->mapped = FALSE; pWin->mapped = FALSE;
if (wasRealized) if (wasRealized)
UnrealizeTree(pWin, fromConfigure); UnrealizeTree(pWin, fromConfigure);
if (wasViewable) { if (wasViewable && !fromConfigure) {
if (!fromConfigure) {
(*pScreen->ValidateTree) (pLayerWin->parent, pWin, VTUnmap); (*pScreen->ValidateTree) (pLayerWin->parent, pWin, VTUnmap);
(*pScreen->HandleExposures) (pLayerWin->parent); (*pScreen->HandleExposures) (pLayerWin->parent);
if (pScreen->PostValidateTree) if (pScreen->PostValidateTree)
(*pScreen->PostValidateTree) (pLayerWin->parent, pWin, VTUnmap); (*pScreen->PostValidateTree) (pLayerWin->parent, pWin, VTUnmap);
} }
}
if (wasRealized && !fromConfigure) { if (wasRealized && !fromConfigure) {
WindowsRestructured(); WindowsRestructured();
WindowGone(pWin); WindowGone(pWin);
@ -2909,8 +2907,7 @@ UnmapSubwindows(WindowPtr pWin)
UnrealizeTree(pChild, FALSE); UnrealizeTree(pChild, FALSE);
} }
} }
if (wasViewable) { if (wasViewable && anyMarked) {
if (anyMarked) {
if (pLayerWin->parent == pWin) if (pLayerWin->parent == pWin)
(*pScreen->MarkWindow) (pWin); (*pScreen->MarkWindow) (pWin);
else { else {
@ -2931,9 +2928,7 @@ UnmapSubwindows(WindowPtr pWin)
(*pScreen->ValidateTree) (pLayerWin->parent, pHead, VTUnmap); (*pScreen->ValidateTree) (pLayerWin->parent, pHead, VTUnmap);
(*pScreen->HandleExposures) (pLayerWin->parent); (*pScreen->HandleExposures) (pLayerWin->parent);
if (pScreen->PostValidateTree) if (pScreen->PostValidateTree)
(*pScreen->PostValidateTree) (pLayerWin->parent, pHead, (*pScreen->PostValidateTree) (pLayerWin->parent, pHead, VTUnmap);
VTUnmap);
}
} }
if (wasRealized) { if (wasRealized) {
WindowsRestructured(); WindowsRestructured();