Merge lp:~smspillaz/compiz-core/compiz-core.fix_936675 into lp:compiz-core

Proposed by Sam Spilsbury
Status: Merged
Merged at revision: 3011
Proposed branch: lp:~smspillaz/compiz-core/compiz-core.fix_936675
Merge into: lp:compiz-core
Diff against target: 17 lines (+3/-4)
1 file modified
src/window.cpp (+3/-4)
To merge this branch: bzr merge lp:~smspillaz/compiz-core/compiz-core.fix_936675
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
Review via email: mp+93759@code.launchpad.net

Description of the change

  Don't silently let windows that we couldn't find a sibling below for sit
  at the top of the stack (LP #936675)

  If we couldn't find a sibling for the window upon initial map, then it means
  that it needs to be placed at the bottom of the stack, since there could be
  windows above it which should not be below the newly created window.

  Fixes a case where on startup, nautilus could be slow to load and new windows
  would be created before nautilus was, and those would go above panels incorrectly.

Automated tests for this are tricky. We could try doing something with xig, except that I'm not sure how broken xig is at the moment.

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Looks good. Tests OK with no additional stacking issues.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/window.cpp'
2--- src/window.cpp 2012-02-16 02:20:08 +0000
3+++ src/window.cpp 2012-02-20 02:36:17 +0000
4@@ -4604,10 +4604,9 @@
5 }
6 }
7
8- if (sibling)
9- {
10- mask |= priv->addWindowStackChanges (&xwc, sibling);
11- }
12+ /* If sibling is NULL, then this window will go on the bottom
13+ * of the stack */
14+ mask |= priv->addWindowStackChanges (&xwc, sibling);
15 }
16
17 mask |= priv->addWindowSizeChanges (&xwc, priv->serverGeometry);

Subscribers

People subscribed via source and target branches