Compiz Core

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

  1. compiz-core.core_871801
  2. Merge into 0.9.7
Proposed by Sam Spilsbury
Status: Merged
Merged at revision: 3001
Proposed branch: lp:~smspillaz/compiz-core/compiz-core.core_871801
Merge into: lp:compiz-core
Diff against target: 21 lines (+2/-2)
1 file modified
src/window.cpp (+2/-2)
To merge this branch: bzr merge lp:~smspillaz/compiz-core/compiz-core.core_871801
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
Review via email: mp+92923@code.launchpad.net

Description of the change

Work for LP #871801 on the compiz-core side of things.

There's no point to leaving showdesktop mode multiple times if a window has transients.

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

LGTM

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-01-31 14:52:20 +0000
3+++ src/window.cpp 2012-02-14 07:43:18 +0000
4@@ -4651,8 +4651,6 @@
5 {
6 if (window->minimized ())
7 window->unminimize ();
8-
9- screen->leaveShowDesktopMode (window);
10 }
11
12 void
13@@ -4677,6 +4675,8 @@
14 boost::bind (PrivateWindow::revealAncestors, _1, this));
15 priv->reveal ();
16
17+ screen->leaveShowDesktopMode (window);
18+
19 if (priv->state & CompWindowStateHiddenMask)
20 {
21 priv->state &= ~CompWindowStateShadedMask;

Subscribers

People subscribed via source and target branches