Unity

Merge lp:~unity-team/unity/window-spread-popup-fix into lp:unity

  1. window-spread-popup-fix
  2. Merge into trunk
Proposed by Jason Smith
Status: Merged
Merged at revision: 542
Proposed branch: lp:~unity-team/unity/window-spread-popup-fix
Merge into: lp:unity
Diff against target: 26 lines (+8/-1)
1 file modified
targets/mutter/window-management.vala (+8/-1)
To merge this branch: bzr merge lp:~unity-team/unity/window-spread-popup-fix
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+36349@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'targets/mutter/window-management.vala'
2--- targets/mutter/window-management.vala 2010-09-22 04:06:23 +0000
3+++ targets/mutter/window-management.vala 2010-09-22 17:22:59 +0000
4@@ -162,6 +162,13 @@
5 this.plugin.plugin.map_completed (window);
6 return;
7 }
8+
9+ if (plugin.expose_manager.expose_showing)
10+ {
11+ window.opacity = 0;
12+ this.plugin.plugin.map_completed (window);
13+ return;
14+ }
15
16 if (type == Mutter.MetaWindowType.NORMAL ||
17 type == Mutter.MetaWindowType.DIALOG)
18@@ -177,7 +184,7 @@
19 Clutter.Actor actor = window as Clutter.Actor;
20 actor.opacity = 0;
21 window.show ();
22-
23+
24 int speed = get_animation_speed (window);
25
26 Mutter.MetaRectangle rect = {0, 0, 0, 0};