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

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

Description of the change

== Problem ==

See LP#976467

== Solution ==

_NET_WM_WINDOW_TYPE_MENU isn't what you might expect, disregard them.
Also update clip regions when the window output extents changes but
::resizeNotify isn't called.

== Tests ==

Already covered

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

Looks good. And seems to fix the bug too.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/decor/src/decor.cpp'
2--- plugins/decor/src/decor.cpp 2012-03-30 14:29:18 +0000
3+++ plugins/decor/src/decor.cpp 2012-04-08 10:16:19 +0000
4@@ -1520,6 +1520,8 @@
5 if (decorate)
6 updateFrame ();
7 window->updateWindowOutputExtents ();
8+ mOutputRegion = CompRegion (window->outputRect ());
9+ updateGroupShadows ();
10 if (dScreen->cmActive)
11 cWindow->damageOutputExtents ();
12 updateDecorationScale ();
13@@ -2932,7 +2934,7 @@
14 None,
15 boost::shared_array <decor_quad_t> (NULL),
16 0)),
17- mMenusClipGroup (CompMatch ("type=Dock | type=DropdownMenu | type=Menu | type=PopupMenu"))
18+ mMenusClipGroup (CompMatch ("type=Dock | type=DropdownMenu | type=PopupMenu"))
19 {
20 supportingDmCheckAtom =
21 XInternAtom (s->dpy (), DECOR_SUPPORTING_DM_CHECK_ATOM_NAME, 0);

Subscribers

People subscribed via source and target branches