fix for changing window buttons order. destroy them properly when they no longer...

[chaz/openbox] / src / Workspace.cc

diff --git a/src/Workspace.cc b/src/Workspace.cc
index 89ea8e7bc9fa31742555909c87c9178f1b6a38af..5982f878a8bf2631394a043b73fd613ddeaa551d 100644 (file)
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -86,8 +86,6 @@ Workspace::~Workspace(void) {
 const int Workspace::addWindow(OpenboxWindow *w, Bool place) {
   if (! w) return -1;
 
-  if (place) placeWindow(*w);
-
   w->setWorkspace(id);
   w->setWindowNumber(_windows.size());
 
@@ -101,6 +99,8 @@ const int Workspace::addWindow(OpenboxWindow *w, Bool place) {
 
   raiseWindow(w);
 
+  if (place) placeWindow(*w);
+
   return w->getWindowNumber();
 }
 
@@ -119,8 +119,6 @@ const int Workspace::removeWindow(OpenboxWindow *w) {
           _zorder.empty() ||                    // click focus but no windows
           !_zorder.front()->setInputFocus()) {  // tried window, but wont focus
        screen.getOpenbox().focusWindow((OpenboxWindow *) 0);
-        XSetInputFocus(screen.getOpenbox().getXDisplay(),
-                       PointerRoot, None, CurrentTime);
       }
     }
   }