Compiz Core

Merge lp:~compiz-team/compiz-core/compiz-core.fix_861909 into lp:compiz-core/0.9.5

  1. compiz-core.fix_861909
  2. Merge into 0.9.5
Proposed by Sam Spilsbury
Status: Merged
Merged at revision: 2850
Proposed branch: lp:~compiz-team/compiz-core/compiz-core.fix_861909
Merge into: lp:compiz-core/0.9.5
Diff against target: 22 lines (+10/-2)
1 file modified
src/window.cpp (+10/-2)
To merge this branch: bzr merge lp:~compiz-team/compiz-core/compiz-core.fix_861909
Reviewer Review Type Date Requested Status
Jason Smith (community) Approve
Review via email: mp+77554@code.launchpad.net

Description of the change

Fix bug 861909

To post a comment you must log in.
Revision history for this message
Jason Smith (jassmith) wrote :

Good catch

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 2011-09-29 03:52:13 +0000
3+++ src/window.cpp 2011-09-29 15:10:53 +0000
4@@ -2033,8 +2033,16 @@
5 if (priv->frameGeometry.border () != ce->border_width)
6 valueMask |= CWBorderWidth;
7
8- if (ROOTPARENT (window->prev) != ce->above)
9- valueMask |= CWSibling | CWStackMode;
10+ if (window->prev)
11+ {
12+ if (ROOTPARENT (window->prev) != ce->above)
13+ valueMask |= CWSibling | CWStackMode;
14+ }
15+ else
16+ {
17+ if (ce->above != 0)
18+ valueMask |= CWSibling | CWStackMode;
19+ }
20
21 for (std::list <XWCValueMask>::iterator it = pendingConfigures.begin ();
22 it != pendingConfigures.end (); it++)

Subscribers

People subscribed via source and target branches