Unity 8

Merge lp:~mzanetti/unity8/reveal-launcher-with-mouse-hover into lp:unity8

reveal-launcher-with-mouse-hover
Merge into trunk

Proposed by Michael Zanetti on 2015-02-06

Status:	Merged
Approved by:	Albert Astals Cid on 2015-02-23
Approved revision:	1600
Merged at revision:	1623
Proposed branch:	lp:~mzanetti/unity8/reveal-launcher-with-mouse-hover
Merge into:	lp:unity8
Diff against target:	76 lines (+40/-3) 1 file modified qml/Launcher/Launcher.qml (+40/-3)
To merge this branch:	bzr merge lp:~mzanetti/unity8/reveal-launcher-with-mouse-hover
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-02-23
Albert Astals Cid (community)		2015-02-06	Approve on 2015-02-23
Review via email: mp+248913@code.launchpad.net

Commit Message

enable revealing the launcher by hitting the left edge using the mouse

Description of the Change

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

n/a

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

n/a

lp:~mzanetti/unity8/reveal-launcher-with-mouse-hover updated on 2015-02-06

1595. By Michael Zanetti on 2015-02-06: fix comment

PS Jenkins bot (ps-jenkins) wrote on 2015-02-06:

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-02-09:

launcher tests are failing

review: Needs Fixing

lp:~mzanetti/unity8/reveal-launcher-with-mouse-hover updated on 2015-02-11

1596. By Michael Zanetti on 2015-02-11: merge trunk
1597. By Michael Zanetti on 2015-02-11: disable the MouseArea in case we revealed the launcher by a touch drag

Michael Zanetti (mzanetti) wrote on 2015-02-11:

> launcher tests are failing

fixed

PS Jenkins bot (ps-jenkins) wrote on 2015-02-11:

FAILED: Continuous integration, rev:1597
http://jenkins.qa.ubuntu.com/job/unity8-ci/5290/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1297
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/454
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/455
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/455
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1295
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1295/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17965

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-02-13:

- interval: 5000
+ interval: 500

Seems rather extreme, is that something that should depend on mouse vs touch or similar?

review: Needs Information

Michael Zanetti (mzanetti) wrote on 2015-02-14:

> - interval: 5000
> + interval: 500
>
> Seems rather extreme, is that something that should depend on mouse vs touch
> or similar?

Note that the timer is not used for touch any more at all. The launcher doesn't auto-hide any more if you drag it in via touch. It should, however, auto-hide when you reveal it by a mouse hover event, and in that case it should also disappear very quickly when the mouse leaves the launcher. Unity7 seems to have 500ms there too, so I used that value.

Albert Astals Cid (aacid) wrote on 2015-02-16:

Ok then I'll abstain, i guess i need unity8 running in destkop mode that i don't and i'm sure others have so it'll be easier for them to review/test

review: Abstain

Albert Astals Cid (aacid) wrote on 2015-02-18:

The launcher is hidden immediately after moving the mouse out, i increased the interval to 5000 just to be sure, and it still hides immediately

review: Needs Fixing

lp:~mzanetti/unity8/reveal-launcher-with-mouse-hover updated on 2015-02-19

1598. By Michael Zanetti on 2015-02-19: fix the timer usage

Michael Zanetti (mzanetti) wrote on 2015-02-19:

> The launcher is hidden immediately after moving the mouse out, i increased the
> interval to 5000 just to be sure, and it still hides immediately

fixed. thanks!

Albert Astals Cid (aacid) wrote on 2015-02-19:

aacid: how hard would it be to get a unittest for the hide thing you just fixed
mzanetto: quite hard, because we can't have mouse events atm, needs changes in our uqmlscene

Albert Astals Cid (aacid) wrote on 2015-02-19:

Clicking on the laucnher items after revealing with hover doesn't seem to work

review: Needs Fixing

PS Jenkins bot (ps-jenkins) wrote on 2015-02-19:

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

review: Needs Fixing (continuous-integration)

lp:~mzanetti/unity8/reveal-launcher-with-mouse-hover updated on 2015-02-19

1599. By Michael Zanetti on 2015-02-19: merge trunk

PS Jenkins bot (ps-jenkins) wrote on 2015-02-19:

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

review: Needs Fixing (continuous-integration)

lp:~mzanetti/unity8/reveal-launcher-with-mouse-hover updated on 2015-02-23

1600. By Michael Zanetti on 2015-02-23: fix enabled condition

Albert Astals Cid (aacid) wrote on 2015-02-23:

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

* Did CI run pass?
No, known broken tests

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

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-02-23:

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

review: Needs Fixing (continuous-integration)

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:

Michael Zanetti

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Launcher/Launcher.qml'
 --- qml/Launcher/Launcher.qml	2015-02-01 22:13:02 +0000
 +++ qml/Launcher/Launcher.qml	2015-02-23 10:15:33 +0000
@@ -93,10 +93,10 @@
      Timer {
          id: dismissTimer
          objectName: "dismissTimer"
--        interval: 5000
++        interval: 500
          onTriggered: {
              if (root.autohideEnabled) {
--                if (!panel.preventHiding) {
++                if (!panel.preventHiding && !hoverArea.containsMouse) {
                      root.state = ""
                  } else {
                      dismissTimer.restart()
@@ -159,7 +159,7 @@
      MouseArea {
          id: launcherDragArea
--        enabled: root.available && root.state == "visible"
++        enabled: root.available && (root.state == "visible" || root.state == "visibleTemporary")
          anchors.fill: panel
          anchors.rightMargin: -units.gu(2)
          drag {
@@ -245,6 +245,33 @@
+         }
+     }
++    // TODO: This should be replaced by some mechanism that reveals the launcher
++    // after a certain resistance has been overcome, like unity7 does. However,
++    // as we don't get relative mouse coordinates yet, this will do for now.
++    MouseArea {
++        id: hoverArea
++        anchors { fill: panel; rightMargin: -1 }
++        hoverEnabled: true
++        propagateComposedEvents: true
++        onContainsMouseChanged: {
++            if (containsMouse) {
++                root.switchToNextState("visibleTemporary");
++            } else {
++                dismissTimer.restart();
++            }
++        }
++        onPressed: mouse.accepted = false;
++
++        // We need to eat touch events here in order to make sure that
++        // we don't trigger both, the dragArea and the hoverArea
++        MultiPointTouchArea {
++            anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
++            width: units.dp(1)
++            mouseEnabled: false
++            enabled: parent.enabled
++        }
++    }
++
      EdgeDragArea {
          id: dragArea
          objectName: "launcherDragArea"
@@ -300,6 +327,16 @@
                  target: panel
                  x: -root.x // so we never go past panelWidth, even when teased by tutorial
+             }
++            PropertyChanges { target: hoverArea; enabled: false }
++        },
++        State {
++            name: "visibleTemporary"
++            extend: "visible"
++            PropertyChanges {
++                target: root
++                autohideEnabled: true
++            }
++            PropertyChanges { target: hoverArea; enabled: true }
          },
          State {
              name: "teasing"