1
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml'
2
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml	2016-05-11 21:17:26 +0000
3
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml	2016-05-18 11:32:26 +0000
4
@@ -143,7 +143,7 @@
5
143
        if (visible) {
143
        if (visible) {
6
144
            // Make sure the flickable is back inside its bounds when
144
            // Make sure the flickable is back inside its bounds when
7
145
            //  the Page becomes visible again:
145
            //  the Page becomes visible again:
9
146
            view.returnToBounds();
146
            control.target.returnToBounds();
10
147
        }
147
        }
11
148
    }
148
    }
12
149
149
13
150
150
14
=== modified file 'tests/unit_x11/tst_components/tst_pulltorefresh_topmargin.qml'
15
--- tests/unit_x11/tst_components/tst_pulltorefresh_topmargin.qml	2016-05-13 10:16:27 +0000
16
+++ tests/unit_x11/tst_components/tst_pulltorefresh_topmargin.qml	2016-05-18 11:32:26 +0000
17
@@ -24,16 +24,16 @@
18
24
    height: units.gu(71)
24
    height: units.gu(71)
19
25
    id: root
25
    id: root
20
26
    Flickable {
26
    Flickable {
22
27
        id: view
27
        id: flickable
23
28
        anchors.fill: parent
28
        anchors.fill: parent
25
29
        contentHeight: 1.6*view.height
29
        contentHeight: 1.6*flickable.height
26
30
        Label {
30
        Label {
27
31
            anchors.centerIn: parent
31
            anchors.centerIn: parent
28
32
            text: "void"
32
            text: "void"
29
33
        }
33
        }
30
34
        PullToRefresh {
34
        PullToRefresh {
31
35
            id: pullToRefresh
35
            id: pullToRefresh
33
36
            parent: view
36
            parent: flickable
34
37
            onRefresh: {
37
            onRefresh: {
35
38
                refreshing = true;
38
                refreshing = true;
36
39
                refreshing = false;
39
                refreshing = false;
37
@@ -46,13 +46,13 @@
38
46
        when: windowShown
46
        when: windowShown
39
47
47
40
48
        function test_reposition_after_refresh_bug1578619() {
48
        function test_reposition_after_refresh_bug1578619() {
46
49
            var initialTopMargin = view.topMargin;
49
            var initialTopMargin = flickable.topMargin;
47
50
            var initialContentY = view.contentY;
50
            var initialContentY = flickable.contentY;
48
51
            flick(view, view.width/2, units.gu(10), 0, units.gu(40));
51
            flick(flickable, flickable.width/2, units.gu(10), 0, units.gu(40));
49
52
            tryCompare(view, "moving", false);
52
            tryCompare(flickable, "moving", false);
50
53
            tryCompare(view, "topMargin", initialTopMargin, 500,
53
            tryCompare(flickable, "topMargin", initialTopMargin, 500,
51
54
                    "Initial topMargin of flickable is not restored after refreshing.");
54
                    "Initial topMargin of flickable is not restored after refreshing.");
53
55
            tryCompare(view, "contentY", initialContentY, 500,
55
            tryCompare(flickable, "contentY", initialContentY, 500,
54
56
                    "Initial contentY of flickable is not restored after refreshing.")
56
                    "Initial contentY of flickable is not restored after refreshing.")
55
57
        }
57
        }
56
58
    }
58
    }
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-05-18
Cris Dywan			Approve on 2016-05-18
Zsombor Egri		2016-05-18	Approve on 2016-05-18
PS Jenkins bot	continuous-integration	2016-05-18	Pending
Review via email: mp+295038@code.launchpad.net
1	=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml'
2	--- src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml 2016-05-11 21:17:26 +0000
3	+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml 2016-05-18 11:32:26 +0000
4	@@ -143,7 +143,7 @@
5	143	if (visible) {	143	if (visible) {
6	144	// Make sure the flickable is back inside its bounds when	144	// Make sure the flickable is back inside its bounds when
7	145	// the Page becomes visible again:	145	// the Page becomes visible again:
9	146	view.returnToBounds();	146	control.target.returnToBounds();
10	147	}	147	}
11	148	}	148	}
12	149		149
13	150		150
14	=== modified file 'tests/unit_x11/tst_components/tst_pulltorefresh_topmargin.qml'
15	--- tests/unit_x11/tst_components/tst_pulltorefresh_topmargin.qml 2016-05-13 10:16:27 +0000
16	+++ tests/unit_x11/tst_components/tst_pulltorefresh_topmargin.qml 2016-05-18 11:32:26 +0000
17	@@ -24,16 +24,16 @@
18	24	height: units.gu(71)	24	height: units.gu(71)
19	25	id: root	25	id: root
20	26	Flickable {	26	Flickable {
22	27	id: view	27	id: flickable
23	28	anchors.fill: parent	28	anchors.fill: parent
25	29	contentHeight: 1.6*view.height	29	contentHeight: 1.6*flickable.height
26	30	Label {	30	Label {
27	31	anchors.centerIn: parent	31	anchors.centerIn: parent
28	32	text: "void"	32	text: "void"
29	33	}	33	}
30	34	PullToRefresh {	34	PullToRefresh {
31	35	id: pullToRefresh	35	id: pullToRefresh
33	36	parent: view	36	parent: flickable
34	37	onRefresh: {	37	onRefresh: {
35	38	refreshing = true;	38	refreshing = true;
36	39	refreshing = false;	39	refreshing = false;
37	@@ -46,13 +46,13 @@
38	46	when: windowShown	46	when: windowShown
39	47		47
40	48	function test_reposition_after_refresh_bug1578619() {	48	function test_reposition_after_refresh_bug1578619() {
46	49	var initialTopMargin = view.topMargin;	49	var initialTopMargin = flickable.topMargin;
47	50	var initialContentY = view.contentY;	50	var initialContentY = flickable.contentY;
48	51	flick(view, view.width/2, units.gu(10), 0, units.gu(40));	51	flick(flickable, flickable.width/2, units.gu(10), 0, units.gu(40));
49	52	tryCompare(view, "moving", false);	52	tryCompare(flickable, "moving", false);
50	53	tryCompare(view, "topMargin", initialTopMargin, 500,	53	tryCompare(flickable, "topMargin", initialTopMargin, 500,
51	54	"Initial topMargin of flickable is not restored after refreshing.");	54	"Initial topMargin of flickable is not restored after refreshing.");
53	55	tryCompare(view, "contentY", initialContentY, 500,	55	tryCompare(flickable, "contentY", initialContentY, 500,
54	56	"Initial contentY of flickable is not restored after refreshing.")	56	"Initial contentY of flickable is not restored after refreshing.")
55	57	}	57	}
56	58	}	58	}