Window management - pressing the 'restore' window indicator on a semi-maximised window should return it to the restored state

(still waiting on some merges)

=== added file 'debian/patches/rev_2847_bug_796594.patch'
--- debian/patches/rev_2847_bug_796594.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/rev_2847_bug_796594.patch 2011-10-17 07:16:06 +0000
@@ -0,0 +1,161 @@
+=== modified file 'plugins/decor/src/decor.cpp'
+Index: compiz-0.9.6+bzr20110929/plugins/decor/src/decor.cpp
+===================================================================
+--- compiz-0.9.6+bzr20110929.orig/plugins/decor/src/decor.cpp 2011-10-17 15:12:20.278356818 +0800
++++ compiz-0.9.6+bzr20110929/plugins/decor/src/decor.cpp 2011-10-17 15:12:22.718368920 +0800
+@@ -934,7 +934,7 @@
+ if (!wd)
+ return false;
+
+- if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
++ if ((window->state () & MAXIMIZE_STATE))
+ window->setWindowFrameExtents (&wd->decor->maxBorder,
+ &wd->decor->maxInput);
+ else if (!window->hasUnmapReference ())
+@@ -1084,7 +1084,7 @@
+ else
+ parent = window->frame ();
+
+- if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
++ if ((window->state () & MAXIMIZE_STATE))
+ {
+ border = wd->decor->maxBorder;
+ input = wd->decor->maxInput;
+@@ -1214,7 +1214,7 @@
+ int bw = server.border () * 2;
+ CompWindowExtents input;
+
+- if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
++ if ((window->state () & MAXIMIZE_STATE))
+ input = wd->decor->maxInput;
+ else
+ input = wd->decor->input;
+@@ -2007,7 +2007,7 @@
+ int oldShiftY = shiftY ();
+ int moveDx, moveDy;
+
+- if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
++ if ((window->state () & MAXIMIZE_STATE))
+ window->setWindowFrameExtents (&wd->decor->maxBorder,
+ &wd->decor->maxInput);
+ else
+Index: compiz-0.9.6+bzr20110929/src/window.cpp
+===================================================================
+--- compiz-0.9.6+bzr20110929.orig/src/window.cpp 2011-10-17 15:12:51.974513993 +0800
++++ compiz-0.9.6+bzr20110929/src/window.cpp 2011-10-17 15:14:52.863113452 +0800
+@@ -3855,9 +3855,9 @@
+
+ if (state & CompWindowStateMaximizedVertMask)
+ {
+- if (old.y () < y + workArea.y () + serverInput.top)
++ if (old.y () < y + workArea.y () + border.top)
+ {
+- xwc->y = y + workArea.y () + serverInput.top;
++ xwc->y = y + workArea.y () + border.top;
+ mask |= CWY;
+ }
+ else
+@@ -3865,16 +3865,16 @@
+ height = xwc->height + old.border () * 2;
+
+ max = y + workArea.bottom ();
+- if (old.y () + (int) old.height () + serverInput.bottom > max)
++ if (old.y () + (int) old.height () + border.bottom > max)
+ {
+- xwc->y = max - height - serverInput.bottom;
++ xwc->y = max - height - border.bottom;
+ mask |= CWY;
+ }
+- else if (old.y () + height + serverInput.bottom > max)
++ else if (old.y () + height + border.bottom > max)
+ {
+ xwc->y = y + workArea.y () +
+- (workArea.height () - serverInput.top - height -
+- serverInput.bottom) / 2 + serverInput.top;
++ (workArea.height () - border.top - height -
++ border.bottom) / 2 + border.top;
+ mask |= CWY;
+ }
+ }
+@@ -3882,9 +3882,9 @@
+
+ if (state & CompWindo...

Hello John, or anyone else affected,

Accepted compiz into oneiric-proposed, the package will build now and be available in a few hours. Please test and give feedback here. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to enable and use -proposed. Thank you in advance!

This bug was fixed in the package compiz - 1:0.9.6+bzr20110929-0ubuntu7

---------------
compiz (1:0.9.6+bzr20110929-0ubuntu7) precise; urgency=low

  * Upload to precise

compiz (1:0.9.6+bzr20110929-0ubuntu6) oneiric-proposed; urgency=low

  * debian/patches/rev_2821_fix_807487.patch:
    - unity-window-decorator crashed with SIGSEGV in
      g_datalist_id_set_data_full() (LP: #807487)
  * debian/patches/rev_2847_bug_796594.patch:
    - Window behaviour - pressing the 'restore' window indicator on a
      semi-maximised window should return it to the restored state
      (LP: #796594)
  * debian/patches/rev_2878_bug_865696.patch:
    - Windows from other workspaces missing decorations in window spread
      (LP: #865696)
  * debian/patches/rev_2884_fix_874004.patch:
    - When a window is minimized on another workspace it doesn't appear
      in the spread (LP: #874004)
  * debian/patches/rev_2890_fix_879253.patch:
    - Makes the previous patch building and not crashing.
  * Add some upstream missing bits from previous fixes:
    - debian/patches/fix-864330.patch
    - debian/patches/fix-864478.patch
  * debian/patches/fix-886978.patch:
    - compiz crashes with SIGSEGV in PrivateWindow::configure (LP: #886978)
 -- Didier Roche <email address hidden> Thu, 10 Nov 2011 09:11:57 +0100

The proposed version resolves this bug. The semi-maximized window is not maximized but restored to the previous state.

In my opinion the window should be restored to its original height and width but the width of the window is not restored. The window remains half-screen wide but this fix is already an improvement.

This bug was fixed in the package compiz - 1:0.9.6+bzr20110929-0ubuntu6

---------------
compiz (1:0.9.6+bzr20110929-0ubuntu6) oneiric-proposed; urgency=low

  * debian/patches/rev_2821_fix_807487.patch:
    - unity-window-decorator crashed with SIGSEGV in
      g_datalist_id_set_data_full() (LP: #807487)
  * debian/patches/rev_2847_bug_796594.patch:
    - Window behaviour - pressing the 'restore' window indicator on a
      semi-maximised window should return it to the restored state
      (LP: #796594)
  * debian/patches/rev_2878_bug_865696.patch:
    - Windows from other workspaces missing decorations in window spread
      (LP: #865696)
  * debian/patches/rev_2884_fix_874004.patch:
    - When a window is minimized on another workspace it doesn't appear
      in the spread (LP: #874004)
  * debian/patches/rev_2890_fix_879253.patch:
    - Makes the previous patch building and not crashing.
  * Add some upstream missing bits from previous fixes:
    - debian/patches/fix-864330.patch
    - debian/patches/fix-864478.patch
  * debian/patches/fix-886978.patch:
    - compiz crashes with SIGSEGV in PrivateWindow::configure (LP: #886978)
 -- Didier Roche <email address hidden> Thu, 20 Oct 2011 14:23:52 +0200

With 0.9.7 from didrocks ppa on precise this seems fixed. I am able to drag windows to the side or top of the screen, and then use the restore button to get them back to their previous size (but not their previous location).

Reverted to confirmed because after testing it looks like this is still not fixed. To reproduce:

--- Test 1 ---

1. Take a restored Nautilus window
2. Drag it to the side of the screen to semi-maximise it
3. Press the 'restore' window decoration

What currently happens: The Nautilus window goes back to the restored state, with it's original height. However the width of the window changes, and it is not restored to it's original position

What should happen: The Nautilus window should return the window to the restored state, with the same height, width, and position it previously had before the user started the drag that shifted the window to the semi-maximised state.

--- Test 2 ---

1. Take a restored Thunderbird window
2. Drag it to the side of the screen to semi-maximise it
3. Press the 'restore' window decoration

What currently happens: Nothing!
What should happen: The Thunderbird window should return the window to the restored state, with the same height, width, and position it previously had before the user started the drag that shifted the window to the semi-maximised state.

Correction: The original bug described in the title and description is fixed.

The new bug mentioned in comment #8 was already reported 6 months earlier in bug 878516.

@vanvugt; that bug only referred to the issue when the window was restored by dragging downwards, so I have updated the bug description to include the case where the user clicks on the 'restore' window decoration button.

The window correctly restores its size before the semi-maximized user action started but it doesn't restore its position.
If the user action is the drag of the window on the side, the state restored should be the one before the dragging gesture started, not when the window touched the edge.

Still doesn't restore the window at the right location (the position the window had before the drag to semi-maximized gesture starts).

Marking as Fix Released because we can not reproduce this on released 13.04 desktops.