Merge lp:~townsend/unity/fix-lp1251777 into lp:unity

[Christopher Townsend]

Fixes issue when using the Ctrl-Super-Left/Right shortcuts to vertically semi-maximize a window and then restoring the window would not place the window back in its original place.

= Issue =
Due to revno. 3509, when vertically semi-maximizing a window using Ctrl-Super-Left/Right and then restoring the window, the window would not return to the same place and correct size.

= Fix =
Save the x coordinate and width (including borders), so restoring will be correct.

= Test =
Added to the test_restore_vertically_maximized_window AP test to save the window geometry before vertically semi-maximizing and then get the geometry after restoring and then compare the two.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3598
http://jenkins.qa.ubuntu.com/job/unity-ci/513/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/47

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/513/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Mh, for some reason this doesn't seem to work to me... The window goes back to center but using the full height...

[Brandon Schaefer (brandontschaefer)]

If you semi max a window Left, then Right. Then click on the decoration title bar it puts the window back into an incorrect position. I've tested that its this branch that is causing it. Similar to what Marco is describing.

Other then that it seems to be working quite well.

review: Needs Fixing

[Christopher Townsend (townsend)]

Rejecting this since I re-did how this is done with a different MP.

review: Disapprove

Unmerged revisions

3598. By Christopher Townsend on 2013-11-20

Fixes issue when using the Ctrl-Super-Left/Right shortcuts to vertically semi-maximize a window and then restoring the window would not place the wi
ndow back in its original place.

=== modified file 'tests/autopilot/unity/tests/test_wm_keybindings.py'
--- tests/autopilot/unity/tests/test_wm_keybindings.py	2013-10-08 14:20:04 +0000
+++ tests/autopilot/unity/tests/test_wm_keybindings.py	2013-11-20 21:38:42 +0000
@@ -126,10 +126,18 @@
         if not self.start_restored:
             self.addCleanup(self.keybinding, "window/maximize")
             self.keybinding("window/restore")
+        (x1, y1, w1, h1) = self.screen_win.geometry
         self.keyboard.press_and_release("Ctrl+Super+Right")
         self.keybinding("window/restore")
+        (x2, y2, w2, h2) = self.screen_win.geometry
+
         self.assertThat(self.screen_win.vertically_maximized, Eventually(Equals(False)))
         self.assertThat(self.screen_win.minimized, Eventually(Equals(False)))
+        # Make sure the window restored to its same geometry before vertically maximizing
+        self.assertThat(x1, Equals(x2))
+        self.assertThat(y1, Equals(y2))
+        self.assertThat(w1, Equals(w2))
+        self.assertThat(h1, Equals(h2))
 
     def test_minimize_restored_window(self):
         if not self.start_restored:

=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2013-11-14 00:17:19 +0000
+++ unity-shared/PluginAdapter.cpp	2013-11-20 21:38:42 +0000
@@ -726,6 +726,10 @@
     if (!(window->state() & CompWindowStateMaximizedVertMask))
       window->maximize(CompWindowStateMaximizedVertMask);
 
+    window->saveMask() |= CWX | CWWidth;
+    window->saveWc().x = window->x() - window->border().left;
+    window->saveWc().width = window->width() + window->border().left + window->border().right;
+
     /* Then we resize and move it on the requested place */
     MoveResizeWindow(window->id(), geo);
   }