Merge lp:~compiz-team/compiz/compiz.fix_1093757 into lp:compiz/0.9.9

Proposed by Sam Spilsbury
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 3535
Merged at revision: 3536
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1093757
Merge into: lp:compiz/0.9.9
Diff against target: 14 lines (+4/-0)
1 file modified
plugins/grid/src/grid.cpp (+4/-0)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1093757
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+141772@code.launchpad.net

Commit message

Resize grid resize state on maximization. We're not grid-resized anymore once maximized. (LP: #1093757)

Description of the change

Resize grid resize state on maximization. We're not grid-resized anymore once maximized. (LP: #1093757).

Not sure about the best way to autotest this. It will require substantial refactoring of surrounding code.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Verified the bug is fixed by this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/grid/src/grid.cpp'
2--- plugins/grid/src/grid.cpp 2012-11-18 12:18:19 +0000
3+++ plugins/grid/src/grid.cpp 2013-01-03 15:49:23 +0000
4@@ -917,6 +917,10 @@
5 else if (!(lastState & MAXIMIZE_STATE) &&
6 window->state () & MAXIMIZE_STATE)
7 {
8+ /* Unset grid resize state */
9+ isGridResized = false;
10+ resizeCount = 0;
11+
12 if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
13 lastTarget = GridMaximize;
14 if (window->grabbed ())

Subscribers

People subscribed via source and target branches