Unity 8

Merge lp:~lukas-kde/unity8/noResizeUnderPanel into lp:unity8

noResizeUnderPanel
Merge into trunk

Proposed by Lukáš Tinkl on 2016-03-04

Status:

Merged

Approved by:

Josh Arenson on 2016-03-08

Approved revision:

2212

Merged at revision:

2269

Proposed branch:

lp:~lukas-kde/unity8/noResizeUnderPanel

Merge into:

lp:unity8

Diff against target:

48 lines (+26/-1)

2 files modified

qml/Stages/WindowResizeArea.qml (+1/-1)
tests/qmltests/tst_Shell.qml (+25/-0)

To merge this branch:

bzr merge lp:~lukas-kde/unity8/noResizeUnderPanel

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Josh Arenson		2016-03-04	Approve on 2016-03-08
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-03-07
Review via email: mp+288079@code.launchpad.net

Commit Message

Disallow resizing windows up, past the Panel

Description of the Change

Disallow resizing windows up, past the Panel

Cf https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1544766

* Are there any related MPs required for this MP to build/function as expected? Please list.

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* Did you make sure that your branch does not contain spurious tags?

Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Yes

* If you changed the UI, has there been a design review?

N/A

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-04:

FAILED: Continuous integration, rev:2211
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/590/
Executed test runs:
    None: https://unity8-jenkins.ubuntu.com/job/lp-generic-update-mp/687/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/783
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/799
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/799

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/590/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-04:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/592/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-04:

FAILED: Continuous integration, rev:2211
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/594/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/594/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-04:

FAILED: Continuous integration, rev:2211
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/595/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/595/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-04:

PASSED: Continuous integration, rev:2211
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/596/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/596/rebuild

review: Approve (continuous-integration)

lp:~lukas-kde/unity8/noResizeUnderPanel updated on 2016-03-05

2212. By Lukáš Tinkl on 2016-03-05: merge trunk

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-05:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/603/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-07:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/607/rebuild

review: Needs Fixing (continuous-integration)

Josh Arenson (josharenson) wrote on 2016-03-08:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass?
No, but it passed enough (yellow).

* Did you make sure that the branch does not contain spurious tags?
Yes

Code looks good and I couldn't get it to break, despite my best efforts.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Lukáš Tinkl

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Stages/WindowResizeArea.qml'
 --- qml/Stages/WindowResizeArea.qml	2016-02-03 14:00:47 +0000
 +++ qml/Stages/WindowResizeArea.qml	2016-03-05 10:16:28 +0000
@@ -298,7 +298,7 @@
+         }
          if (d.topBorder) {
--            var newTargetY = d.startY + deltaY;
++            var newTargetY = Math.max(d.startY + deltaY, PanelState.panelHeight); // disallow resizing up past Panel
              var bottomBorderY = target.y + target.height;
              if (bottomBorderY > newTargetY + d.minimumHeight) {
                  if (bottomBorderY < newTargetY + d.maximumHeight) {
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2016-02-12 00:11:28 +0000
 +++ tests/qmltests/tst_Shell.qml	2016-03-05 10:16:28 +0000
@@ -1854,6 +1854,31 @@
              compare(appDelegate.y >= PanelState.panelHeight, true);
+         }
++        function test_cantResizeWindowUnderPanel() {
++            loadShell("desktop");
++            shell.usageScenario = "desktop";
++            waitForRendering(shell);
++
++            var app = ApplicationManager.startApplication("dialer-app")
++            waitUntilAppWindowIsFullyLoaded(app);
++
++            var appContainer = findChild(shell, "appContainer");
++            var appDelegate = findChild(appContainer, "appDelegate_dialer-app");
++            var decoration = findChild(appDelegate, "appWindowDecoration_dialer-app");
++            verify(decoration);
++
++            // move it away from launcher and panel
++            appDelegate.x = units.gu(10)
++            appDelegate.y = units.gu(10)
++
++            // drag-resize the area up
++            mousePress(decoration, decoration.width/2, -units.gu(1));
++            mouseMove(decoration, decoration.width/2, -units.gu(100));
++
++            // verify we don't go past the panel
++            compare(appDelegate.y >= PanelState.panelHeight, true);
++        }
++
          function test_restoreWindowStateFixesIfUnderPanel() {
              loadDesktopShellWithApps();
              var appRepeater = findChild(shell, "appRepeater")