1
=== modified file 'qml/Greeter/CoverPage.qml'
2
--- qml/Greeter/CoverPage.qml	2015-07-15 15:07:19 +0000
3
+++ qml/Greeter/CoverPage.qml	2016-02-17 14:48:36 +0000
4
@@ -1,5 +1,5 @@
5
1
/*
1
/*
7
2
 * Copyright (C) 2013,2014,2015 Canonical, Ltd.
2
 * Copyright (C) 2013-2016 Canonical, Ltd.
8
3
 *
3
 *
9
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
10
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
11
@@ -34,6 +34,7 @@
12
34
    readonly property real showProgress: MathUtils.clamp((width - Math.abs(x)) / width, 0, 1)
34
    readonly property real showProgress: MathUtils.clamp((width - Math.abs(x)) / width, 0, 1)
13
35
35
14
36
    signal tease()
36
    signal tease()
15
37
    signal clicked()
16
37
38
17
38
    function hideRight() {
39
    function hideRight() {
18
39
        d.forceRightOnNextHideAnimation = true;
40
        d.forceRightOnNextHideAnimation = true;
19
@@ -55,7 +56,17 @@
20
55
    // instead, we can get a little extra horizontal push by using transforms.
56
    // instead, we can get a little extra horizontal push by using transforms.
21
56
    transform: Translate { id: translation; x: root.draggable ? launcherOffset : 0 }
57
    transform: Translate { id: translation; x: root.draggable ? launcherOffset : 0 }
22
57
58
24
58
    MouseArea { anchors.fill: parent; }
59
    // Eat events elsewhere on the coverpage, except mouse clicks which we pass
25
60
    // up (they are used in the NarrowView to hide the cover page)
26
61
    MouseArea {
27
62
        anchors.fill: parent
28
63
        onClicked: root.clicked()
29
64
30
65
        MultiPointTouchArea {
31
66
            anchors.fill: parent
32
67
            mouseEnabled: false
33
68
        }
34
69
    }
35
59
70
36
60
    Rectangle {
71
    Rectangle {
37
61
        // In case background fails to load
72
        // In case background fails to load
38
62
73
39
=== modified file 'qml/Greeter/Infographics.qml'
40
--- qml/Greeter/Infographics.qml	2015-09-29 12:28:10 +0000
41
+++ qml/Greeter/Infographics.qml	2016-02-17 14:48:36 +0000
42
@@ -1,5 +1,5 @@
43
1
/*
1
/*
45
2
 * Copyright (C) 2013 Canonical, Ltd.
2
 * Copyright (C) 2013-2016 Canonical, Ltd.
46
3
 *
3
 *
47
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
48
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
49
@@ -402,6 +402,7 @@
50
402
402
51
403
    MouseArea {
403
    MouseArea {
52
404
        anchors.fill: dataCircle
404
        anchors.fill: dataCircle
53
405
        enabled: notification.text != ""
54
405
406
55
406
        onDoubleClicked: {
407
        onDoubleClicked: {
56
407
            if (!d.animating) {
408
            if (!d.animating) {
57
408
409
58
=== modified file 'qml/Greeter/NarrowView.qml'
59
--- qml/Greeter/NarrowView.qml	2015-11-19 16:55:31 +0000
60
+++ qml/Greeter/NarrowView.qml	2016-02-17 14:48:36 +0000
61
@@ -1,5 +1,5 @@
62
1
/*
1
/*
64
2
 * Copyright (C) 2015 Canonical, Ltd.
2
 * Copyright (C) 2015-2016 Canonical, Ltd.
65
3
 *
3
 *
66
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
67
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
68
@@ -145,6 +145,7 @@
69
145
        width: parent.width
145
        width: parent.width
70
146
        background: root.background
146
        background: root.background
71
147
        onTease: root.tease()
147
        onTease: root.tease()
72
148
        onClicked: hide()
73
148
149
74
149
        onShowProgressChanged: {
150
        onShowProgressChanged: {
75
150
            if (showProgress === 1) {
151
            if (showProgress === 1) {
76
151
152
77
=== modified file 'tests/qmltests/Greeter/tst_NarrowView.qml'
78
--- tests/qmltests/Greeter/tst_NarrowView.qml	2015-09-02 07:42:27 +0000
79
+++ tests/qmltests/Greeter/tst_NarrowView.qml	2016-02-17 14:48:36 +0000
80
@@ -518,5 +518,14 @@
81
518
            tryCompare(coverPage, "shown", false);
518
            tryCompare(coverPage, "shown", false);
82
519
            tryCompare(coverPage, "showProgress", 0);
519
            tryCompare(coverPage, "showProgress", 0);
83
520
        }
520
        }
84
521
85
522
        // Make sure that if user has a mouse, they can still get rid of cover page
86
523
        function test_mouseClickHidesCoverPage() {
87
524
            var coverPage = findChild(view, "coverPage");
88
525
89
526
            verify(coverPage.shown);
90
527
            mouseClick(coverPage, coverPage.width/2, coverPage.height - units.gu(2));
91
528
            verify(!coverPage.shown);
92
529
        }
93
521
    }
530
    }
94
522
}
531
}
Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2016-02-02	Approve on 2016-02-22
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2016-02-17
Unity8 CI Bot	continuous-integration		Approve on 2016-02-17
Review via email: mp+284804@code.launchpad.net