Merge lp:~sil2100/unity/ignore_unmapped_on_minimize_unminimize_6.0 into lp:unity/6.0

Proposed by Łukasz Zemczak on 2012-10-03
Status: Merged
Approved by: Albert Astals Cid on 2012-10-03
Approved revision: 2755
Merged at revision: 2756
Proposed branch: lp:~sil2100/unity/ignore_unmapped_on_minimize_unminimize_6.0
Merge into: lp:unity/6.0
Diff against target: 21 lines (+2/-2)
1 file modified
plugins/unityshell/src/compizminimizedwindowhandler.h (+2/-2)
To merge this branch: bzr merge lp:~sil2100/unity/ignore_unmapped_on_minimize_unminimize_6.0
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve on 2012-10-03
Albert Astals Cid (community) 2012-10-03 Approve on 2012-10-03
Review via email: mp+127652@code.launchpad.net

Commit Message

Cherry-picked 2786: Ignore transient unmmaped windows on minimize/unminimize
Doesn't make much sense since they are not shown and it confuses Qt code.

Description of the Change

Cherry-picked 2786 from Albert.

Ignore transient unmmaped windows on minimize/unminimize

Doesn't make much sense since they are not shown and it confuses Qt code

To post a comment you must log in.
Albert Astals Cid (aacid) wrote :

Tested, builds and works as well as in the trunk branch

review: Approve
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/compizminimizedwindowhandler.h'
2--- plugins/unityshell/src/compizminimizedwindowhandler.h 2012-06-27 20:45:24 +0000
3+++ plugins/unityshell/src/compizminimizedwindowhandler.h 2012-10-03 07:17:20 +0000
4@@ -154,7 +154,7 @@
5 {
6 CompWindow *win = screen->findWindow (w);
7
8- if (win)
9+ if (win && win->isMapped())
10 {
11 Window *w = Window::get (win);
12 if (!w->mMinimizeHandler)
13@@ -235,7 +235,7 @@
14 {
15 CompWindow *win = screen->findWindow (w);
16
17- if (win)
18+ if (win && win->isMapped())
19 {
20 Window *w = Window::get (win);
21 if (w && w->mMinimizeHandler)

Subscribers

People subscribed via source and target branches