From 5cb2020b9b9cd146d7a5dffa47b44110d8d963ff Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Tue, 23 Jul 2002 16:17:28 +0000 Subject: make modal dialogs unmodal before reassigning focus when they are unmanaged --- src/Screen.cc | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/Screen.cc') diff --git a/src/Screen.cc b/src/Screen.cc index 6970fdf6..eee7db10 100644 --- a/src/Screen.cc +++ b/src/Screen.cc @@ -1257,6 +1257,15 @@ void BScreen::manageWindow(Window w) { void BScreen::unmanageWindow(BlackboxWindow *w, bool remap) { w->restore(remap); + // Remove the modality so that its parent won't try to re-focus the window + if (w->isModal()) w->setModal(False); + + if (w->getWorkspaceNumber() != BSENTINEL && + w->getWindowNumber() != BSENTINEL) + getWorkspace(w->getWorkspaceNumber())->removeWindow(w); + else if (w->isIconic()) + removeIcon(w); + if (w->isNormal()) { // we don't list non-normal windows as managed windows windowList.remove(w); @@ -1272,6 +1281,9 @@ void BScreen::unmanageWindow(BlackboxWindow *w, bool remap) { assert(it != end); // the window wasnt a desktop window? } + if (blackbox->getFocusedWindow() == w) + blackbox->setFocusedWindow((BlackboxWindow *) 0); + removeNetizen(w->getClientWindow()); /* -- cgit v1.2.3