Compiz

Merge lp:~mar-kolya/compiz/fix-for-1188230 into lp:compiz/0.9.10

  1. fix-for-1188230
  2. Merge into 0.9.10
Proposed by kolya
Status: Rejected
Rejected by: MC Return
Proposed branch: lp:~mar-kolya/compiz/fix-for-1188230
Merge into: lp:compiz/0.9.10
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/decor/src/decor.cpp (+1/-1)
To merge this branch: bzr merge lp:~mar-kolya/compiz/fix-for-1188230
Reviewer Review Type Date Requested Status
MC Return Disapprove
Review via email: mp+167782@code.launchpad.net

Commit message

Fix copy/paste error introduced by rev 3728. Fixes LP #1188230

Description of the change

It looks like rev 3678 introduced a copy/paste style error - window's width is being changed using it's height. This causes windows to change their width when they are minimized/restored.

This trivial patch fixes this logical error.

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

This MP reminds me of this MP: https://code.launchpad.net/~mc-return/compiz/compiz.merge-fix1186723-regression-r3728-dropdown-terminals-too-large-now/+merge/167368 ;)

Revision history for this message
kolya (mar-kolya) wrote :

Sorry about that - I looked for tickets describing similar bug, not for similar MPs :(.

Revision history for this message
MC Return (mc-return) wrote :

No need to apologize. ;)
I forgot to "Approve", but we have to wait for Sam for the final ok.

review: Approve
Revision history for this message
MC Return (mc-return) wrote :

Sam reverted r3728, so this is outdated now...

kolya, thanx a lot for your effort though -> fixes are always welcome :)

review: Disapprove

Unmerged revisions

3736. By kolya

Fix copy/paste error introduced by rev 3728. Fixes LP #1188230

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/decor/src/decor.cpp'
2--- plugins/decor/src/decor.cpp 2013-05-20 15:26:11 +0000
3+++ plugins/decor/src/decor.cpp 2013-06-06 15:20:42 +0000
4@@ -1522,7 +1522,7 @@
5
6 int dx = movement.x () - lastShift.x ();
7 int dy = movement.y () - lastShift.y ();
8- int dwidth = sizeDelta.width () - lastSizeDelta.height ();
9+ int dwidth = sizeDelta.width () - lastSizeDelta.width ();
10 int dheight = sizeDelta.height () - lastSizeDelta.height ();
11
12 /* We don't apply these rules to override-redirect windows

Subscribers

People subscribed via source and target branches