Merge lp://staging/~mzanetti/unity/phablet-folding-launcher into lp://staging/unity/phablet

FAILED: Continuous integration, rev:629
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1070/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/1076
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/945/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/949/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1070/rebuild

FAILED: Continuous integration, rev:630
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1073/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/1082
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/948
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/948/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/952
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1751

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1073/rebuild

FAILED: Continuous integration, rev:632
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1094/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/1103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/969
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/969/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/973
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1775

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1094/rebuild

FAILED: Continuous integration, rev:635
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1100/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/975
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/975/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/979
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1787

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1100/rebuild

FAILED: Continuous integration, rev:636
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1103/
Executed test runs:
    ABORTED: http://s-jenkins:8080/job/unity-phablet-qmluitests/1116/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/978
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/978/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/982
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1793

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1103/rebuild

FAILED: Continuous integration, rev:636
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1110/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/985
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/985/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/989
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1810

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1110/rebuild

FAILED: Continuous integration, rev:637
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1111/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/986
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/986/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/990
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1812

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1111/rebuild

FAILED: Continuous integration, rev:637
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1112/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/987
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/987/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/991
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1813

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1112/rebuild

My 2¢ here:
* feels like the long-drag-launcher-to-dash-apps has an unnecessary delay (behavior?) between the finger and the app edge
* when (un)folding, the icons change in distance from the adjacent, unfolded icon - that's not necessarily bad, just noting to make sure that's ok with design

Good refactoring and clean up. Looks way better now!

=====================================================

Icons are not getting highlighted when pressed. The only way I could get an icon highlighted was by long-pressing it.

=====================================================

The branch alone works fine, but if I merge it with latest trunk it get the following wrong behavior:
I have an application on foreground. Right from the beginning of a left-edge drag the application window slides rightwards instead of only after the launcher is fully revealed.

======================================================

+ MouseArea {
+ id: closeMouseArea
+ enabled: root.state == "visible"
+ anchors.fill: panel
+ anchors.rightMargin: -units.gu(2)
+ drag {
+ axis: Drag.XAxis
+ maximumX: 0
+ target: panel
+ }
+
+ onReleased: {
+ if (panel.x < -panel.width/3) {
+ root.switchToNextState("")
+ } else {
+ root.switchToNextState("visible")
             }
         }
- }

- function hide() {
- launcher.state = ""
+ }
+ MouseArea {
+ anchors {
+ left: closeMouseArea.right
+ top: parent.top
+ right: parent.right
+ bottom: parent.bottom
+ }
+ enabled: root.state == "visible"
+ onPressed: {
+ root.state = ""
+ }
     }

I think second MouseArea should be the one named "closeMouseArea" (as it closes the launcher when clicked), not the first one.

============================================================

+ if (distance > root.width / 2){

Coding style: spacing between ')' and '{'

============================================================

- default: // Rejected
+ case Rejected:
+ Q_EMIT draggingChanged(false);
+ break;
+ default:
             // no-op
             break;

Since the default case now deals specifically with invalid states, we could make it issue a qFatal().

============================================================

You can remove this line from Launcher.qml:

import "../Applications/applications.js" as ApplicationsModel

And this one from tst_Launcher.qml:

import "../../../Applications/applications.js" as ApplicationsModel

============================================================

In Shell.qml:

"""
+ InputFilterArea {
+ blockInput: launcher.shown
+ anchors {
+ top: parent.top
+ bottom: parent.bottom
+ left: parent.left
+ }
+ width: launcher.shown ? launcher.width : launcher.panelWidth
+ }

"""

Why not make width just:

+ width: launcher.width

Afterall it only works when launcher.shown is true anyway.

============================================================

tst_Launcher fails to run due to missing symbols, related to "import Unity 0.1".

> My 2¢ here:
> * feels like the long-drag-launcher-to-dash-apps has an unnecessary delay
> (behavior?) between the finger and the app edge

Hmm... might be this:
Behavior on x {SmoothedAnimation{velocity: 600}}

However, I did not touch this and the current launcher has the same. If it would be just some NumberAnimation I would disable it while dragging, but as it is a SmoothedAnimation with some velocity it seems kinda intentional. I'll have a chat with Vesa about it.

> * when (un)folding, the icons change in distance from the adjacent, unfolded
> icon - that's not necessarily bad, just noting to make sure that's ok with
> design

Hmm... this seems to be pretty much the same distance as it is on the desktop. However, next steps in the design work is to figure how many folded items should be visible. Depending on how the others will fade out, this most likely will still change by design.

FAILED: Continuous integration, rev:639
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1132/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/1007
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/1007/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/1011
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1830

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1132/rebuild

> Icons are not getting highlighted when pressed. The only way I could get an
> icon highlighted was by long-pressing it.

fixed.

> =====================================================
>
> The branch alone works fine, but if I merge it with latest trunk it get the
> following wrong behavior:
> I have an application on foreground. Right from the beginning of a left-edge
> drag the application window slides rightwards instead of only after the
> launcher is fully revealed.

Hmm... Can't reproduce. After merging it still seems to be the same for me.

> ======================================================
>
> + MouseArea {
> + id: closeMouseArea
> + enabled: root.state == "visible"
> + anchors.fill: panel
> + anchors.rightMargin: -units.gu(2)
> + drag {
> + axis: Drag.XAxis
> + maximumX: 0
> + target: panel
> + }
> +
> + onReleased: {
> + if (panel.x < -panel.width/3) {
> + root.switchToNextState("")
> + } else {
> + root.switchToNextState("visible")
> }
> }
> - }
>
> - function hide() {
> - launcher.state = ""
> + }
> + MouseArea {
> + anchors {
> + left: closeMouseArea.right
> + top: parent.top
> + right: parent.right
> + bottom: parent.bottom
> + }
> + enabled: root.state == "visible"
> + onPressed: {
> + root.state = ""
> + }
> }
>
> I think second MouseArea should be the one named "closeMouseArea" (as it
> closes the launcher when clicked), not the first one.

Fixed.

> ============================================================
>
> + if (distance > root.width / 2){
>
> Coding style: spacing between ')' and '{'

Fixed.

> ============================================================
>
> - default: // Rejected
> + case Rejected:
> + Q_EMIT draggingChanged(false);
> + break;
> + default:
> // no-op
> break;
>
> Since the default case now deals specifically with invalid states, we could
> make it issue a qFatal().

How I read it, the default case is still valid for the Recognized state.

> ============================================================
>
> You can remove this line from Launcher.qml:
>
> import "../Applications/applications.js" as ApplicationsModel
>
> And this one from tst_Launcher.qml:
>
> import "../../../Applications/applications.js" as ApplicationsModel

fixed.

> ============================================================
>
> In Shell.qml:
>
> """
> + InputFilterArea {
> + blockInput: launcher.shown
> + anchors {
> + top: parent.top
> + bottom: parent.bottom
> + left: parent.left
> + }
> + width: launcher.shown ? launcher.width : launcher.panelWidth
> + }
>
> """
>
> Why not make width just:
>
> + width: launcher.width
>
> Afterall it only works when launcher.shown is true anyway.

Fixed.

> ==================================================...

> >
> > The branch alone works fine, but if I merge it with latest trunk it get the
> > following wrong behavior:
> > I have an application on foreground. Right from the beginning of a left-edge
> > drag the application window slides rightwards instead of only after the
> > launcher is fully revealed.
>
> Hmm... Can't reproduce. After merging it still seems to be the same for me.

Well, it's also working fine for me now. Let's forget about it then. :)

> >
> > - default: // Rejected
> > + case Rejected:
> > + Q_EMIT draggingChanged(false);
> > + break;
> > + default:
> > // no-op
> > break;
> >
> > Since the default case now deals specifically with invalid states, we could
> > make it issue a qFatal().
>
> How I read it, the default case is still valid for the Recognized state.

Right!

One last detail I just spotted:

plugins/Unity/launchermodel.cpp:56:5: warning: unused parameter ‘parent’ [-Wunused-parameter]

FAILED: Continuous integration, rev:643
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1133/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/1008
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/1008/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/1012
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1831

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1133/rebuild

> plugins/Unity/launchermodel.cpp:56:5: warning: unused parameter ‘parent’
> [-Wunused-parameter]

fixed

FAILED: Continuous integration, rev:645
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1135/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1161
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1838

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1135/rebuild

PASSED: Continuous integration, rev:646
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1141/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1846

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1141/rebuild

All good.

Do you think it makes sense to fix those warnings that are output when tst_Launcher.qml is run?

> Do you think it makes sense to fix those warnings that are output when
> tst_Launcher.qml is run?

Done.

PASSED: Continuous integration, rev:647
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1142/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1849

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1142/rebuild