1
=== modified file 'OrganicGrid.qml'
2
--- OrganicGrid.qml	2014-02-14 08:27:12 +0000
3
+++ OrganicGrid.qml	2014-02-19 15:43:07 +0000
4
@@ -9,30 +9,30 @@
5
9
9
6
10
    anchors.fill: parent
10
    anchors.fill: parent
7
11
11
9
12
    // comment 000 start
12
    // comment organicGridRoot_0 start
10
13
    // below property and slot are used for expanding app window in desktop mode
13
    // below property and slot are used for expanding app window in desktop mode
11
14
    property bool canReload: false
14
    property bool canReload: false
12
15
    onHeightChanged: {
13
16
        if (canReload) {
14
17
            canReload = false
15
18
            clear()
16
19
            reload()
17
20
        }
18
21
    }
19
22
15
20
23
    // this value will be changed if the app's width changed
16
    // this value will be changed if the app's width changed
21
24
    property int numberAddMore: 12
17
    property int numberAddMore: 12
29
25
    onWidthChanged: {
18
30
26
        var num = 12 * (1 + width / height)
19
    // connect to MainView's sizeChanged signal
31
27
        numberAddMore = num > 12 ? num : 12
20
    Connections{
32
28
        if (canReload) {
21
        id: connMainview
33
29
            canReload = false
22
        target: mainView
34
30
            clear()
23
35
31
            reload()
24
        onSizeChanged: {
36
25
            var num = 12 * (1 + width / height)
37
26
            numberAddMore = num > 12 ? num : 12
38
27
            if (canReload) {
39
28
                canReload = false
40
29
                clear()
41
30
                reload()
42
31
            }
43
32
        }
32
        }
44
33
    }
33
    }
45
34
34
47
35
    // comment 000 end
35
    // comment organicGridRoot_0 end
48
36
36
49
37
    property var rectangleList: []
37
    property var rectangleList: []
50
38
    property var articleModel: gridViewModel
38
    property var articleModel: gridViewModel
51
39
39
52
=== modified file 'shorts-app.qml'
53
--- shorts-app.qml	2014-02-13 03:55:55 +0000
54
+++ shorts-app.qml	2014-02-19 15:43:07 +0000
55
@@ -20,6 +20,18 @@
56
20
    width: units.gu(50)
20
    width: units.gu(50)
57
21
    height: units.gu(75)
21
    height: units.gu(75)
58
22
22
59
23
    // comment mainview_0 start
60
24
    // this signal will be triggered when size changed
61
25
    // PS: onSizeChanged slot doesn't work
62
26
    signal sizeChanged()
63
27
    onHeightChanged: {
64
28
        sizeChanged()
65
29
    }
66
30
    onWidthChanged: {
67
31
        sizeChanged()
68
32
    }
69
33
    // comment mainview_0 end
70
34
71
23
    headerColor: "#3a2c32"
35
    headerColor: "#3a2c32"
72
24
    backgroundColor: "#875864"
36
    backgroundColor: "#875864"
73
25
    footerColor: "#9b616c"
37
    footerColor: "#9b616c"
Reviewer	Review Type	Date Requested	Status
Roman Shchekin		2014-02-19	Approve on 2014-02-19
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2014-02-19
Review via email: mp+207234@code.launchpad.net