Force IPW to be stacked under its main window.

We don't need to check for the frame window, as the cost of core stacking the frame between main window and IPW is only one restack. We gain much cleaner code for that.

1 files changed, 1 insertions, 20 deletions

diff --git a/shelf.c b/shelf.c
index a8b04ce..60b043a 100644
--- a/shelf.c
+++ b/shelf.c
@@ -336,26 +336,7 @@ shelfAdjustIPWStacking (CompScreen *s)
 
     for (run = ss->shelfedWindows; run; run = run->next)
     {
-	Bool stackingRight = FALSE;
-
-	if (run->w->prev)
-	{
-	    /* the stacking is correct if either
-	       a) the window under the main window is the IPW or
-	       b) the second window under the main window is the IPW,
-	          if the first one is the frame
-	    */
-	    if (run->w->prev->id == run->ipw)
-		stackingRight = TRUE;
-	    else if (run->w->prev->id == run->w->frame)
-	    {
-		if (run->w->prev->prev)
-		    if (run->w->prev->prev->id == run->ipw)
-			stackingRight = TRUE;
-	    }
-	}
-
-	if (!stackingRight)
+	if (!run->w->prev || run->w->prev->id != run->ipw)
 	    shelfAdjustIPW (run->w);
     }
 }