Merge lp:~sjakthol/compiz/fix-1071689 into lp:compiz/0.9.9

Proposed by Sami Jaktholm
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 3474
Merged at revision: 3475
Proposed branch: lp:~sjakthol/compiz/fix-1071689
Merge into: lp:compiz/0.9.9
Diff against target: 13 lines (+2/-1)
1 file modified
plugins/grid/src/grid.cpp (+2/-1)
To merge this branch: bzr merge lp:~sjakthol/compiz/fix-1071689
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
MC Return Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+134809@code.launchpad.net

Commit message

Grid: Set GridWindow->lastTarget to GridMaximize only if the window
was fully maximized.

Currently the lastTarget is changed to GridMaximize also when the
window is only semi-maximized. So if you then try to maximize the
window with grid, grid thinks the target has not changed and overlay
is not shown.

Fixes LP: #1071689

Description of the change

Test case (from bug 1071689):

1. Semi-maximise a window
2. In a single drag action, grab the window title bar and drag the window away from the edge (into the restored state), and then with out releasing the left mouse button drag the window to the top of the screen.

What currently incorrectly happens:
- nothing

What should happen:
- the maximise gesture preview should be displayed

To post a comment you must log in.
Revision history for this message
MC Return (mc-return) wrote :

Tested. Works perfectly. Top job ! \o/

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Works for me.

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-10-24 15:42:30 +0000
3+++ plugins/grid/src/grid.cpp 2012-11-18 16:03:21 +0000
4@@ -917,7 +917,8 @@
5 else if (!(lastState & MAXIMIZE_STATE) &&
6 window->state () & MAXIMIZE_STATE)
7 {
8- lastTarget = GridMaximize;
9+ if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
10+ lastTarget = GridMaximize;
11 if (window->grabbed ())
12 {
13 originalSize = gScreen->slotToRect (window,

Subscribers

People subscribed via source and target branches