Unity 8

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

dragPanelDownToRestoreWindow
Merge into trunk

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

Status:	Superseded
Proposed branch:	lp:~lukas-kde/unity8/dragPanelDownToRestoreWindow
Merge into:	lp:unity8
Diff against target:	61 lines (+34/-0) 2 files modified qml/Panel/Panel.qml (+10/-0) tests/qmltests/tst_Shell.qml (+24/-0)
To merge this branch:	bzr merge lp:~lukas-kde/unity8/dragPanelDownToRestoreWindow
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2016-03-29	Approve on 2016-03-31
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-03-30
Review via email: mp+290327@code.launchpad.net

This proposal has been superseded by a proposal from 2016-05-25.

Commit Message

With a maximized window, "dragging" the panel down should restore it

Description of the Change

With a maximized window, "dragging" the panel down should restore it

Restores a feature parity with unity 7 panel behavior

* 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?

https://docs.google.com/spreadsheets/d/1sauWSMvaPIoyNqkV8x5wpXvo3ZwlRJ2TjDEfmcqprVc/edit?ts=56c5ef19#gid=0

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

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-03-30:

It doesn't unmaximize if you press and hold, move over to the indicator area and then move down to the window area, maybe instead of onExited you want onMoved?

Albert Astals Cid (aacid) wrote on 2016-03-30:

↑

review: Needs Fixing

lp:~lukas-kde/unity8/dragPanelDownToRestoreWindow updated on 2016-03-30

2314. By Lukáš Tinkl on 2016-03-30

properly restore the window

taking the whole panel area into account

Lukáš Tinkl (lukas-kde) wrote on 2016-03-30:

> It doesn't unmaximize if you press and hold, move over to the indicator area
> and then move down to the window area, maybe instead of onExited you want
> onMoved?

Fixed

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

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-03-31:

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

* Did CI run pass?
Yes (unrelated failures)

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

review: Approve

lp:~lukas-kde/unity8/dragPanelDownToRestoreWindow updated on 2016-05-25

2315. By Lukáš Tinkl on 2016-05-02

merge trunk

2316. By Lukáš Tinkl on 2016-05-25

merge trunk

2317. By Lukáš Tinkl on 2016-05-25

unbreak restoring the window

wrt the horiz/vert maximize branch

Unmerged revisions

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/Panel/Panel.qml'
 --- qml/Panel/Panel.qml	2016-05-20 08:43:56 +0000
 +++ qml/Panel/Panel.qml	2016-05-25 14:31:54 +0000
@@ -92,6 +92,7 @@
+         }
          MouseArea {
++            objectName: "windowControlArea"
              anchors {
                  top: parent.top
                  left: parent.left
@@ -102,6 +103,15 @@
              onClicked: callHint.visible ? callHint.showLiveCall() : PanelState.focusMaximizedApp()
              onDoubleClicked: PanelState.maximize()
++            property bool mouseWasPressed: false
++            onPressed: mouseWasPressed = containsPress
++            onMouseYChanged: {
++                if (mouseWasPressed && mouseY > panelHeight) {
++                    PanelState.restoreClicked(); // restore the window when "dragging" the panel down
++                    mouseWasPressed = false;
++                }
++            }
++
              // WindowControlButtons inside the mouse area, otherwise QML doesn't grok nested hover events :/
              // cf. https://bugreports.qt.io/browse/QTBUG-32909
              WindowControlButtons {
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2016-04-27 15:01:10 +0000
 +++ tests/qmltests/tst_Shell.qml	2016-05-25 14:31:54 +0000
@@ -2427,5 +2427,29 @@
              ApplicationManager.requestFocusApplication("calendar-app");
              tryCompare(app2Surface, "keymap", "fr");
+         }
++
++        function test_dragPanelToRestoreMaximizedWindow() {
++            loadShell("desktop");
++            shell.usageScenario = "desktop";
++            waitForRendering(shell);
++            var panel = findChild(shell, "windowControlArea");
++            verify(panel);
++
++            var app = ApplicationManager.startApplication("dialer-app")
++            waitUntilAppWindowIsFullyLoaded(app);
++
++            // start dialer, maximize it
++            var appContainer = findChild(shell, "appContainer");
++            var appDelegate = findChild(appContainer, "appDelegate_dialer-app");
++            verify(appDelegate);
++            appDelegate.maximize();
++            tryCompare(appDelegate, "state", "maximized");
++
++            mousePress(panel);
++            mouseMove(shell, shell.width/2, shell.height/2);
++            mouseRelease(shell);
++
++            tryCompare(appDelegate, "state", "normal");
++        }
+     }
+ }