Merge lp:~qqworini/ubuntu-rssreader-app/update-grid-to-desktop into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Joey Chan]

update grid mode to make it adjustable for desktop mode

update grid mode to make it adjustable for desktop mode

* width and height changes will reload whole grid items to fill the app window

* splitted content not implemented yet

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:173
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/175/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1322/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/175
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/175
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/62

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/175/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'OrganicGrid.qml'
--- OrganicGrid.qml	2013-11-05 19:29:36 +0000
+++ OrganicGrid.qml	2014-02-14 09:22:48 +0000
@@ -9,6 +9,31 @@
 
     anchors.fill: parent
 
+    // comment 000 start
+    // below property and slot are used for expanding app window in desktop mode
+    property bool canReload: false
+    onHeightChanged: {
+        if (canReload) {
+            canReload = false
+            clear()
+            reload()
+        }
+    }
+
+    // this value will be changed if the app's width changed
+    property int numberAddMore: 12
+    onWidthChanged: {
+        var num = 12 * (1 + width / height)
+        numberAddMore = num > 12 ? num : 12
+        if (canReload) {
+            canReload = false
+            clear()
+            reload()
+        }
+    }
+
+    // comment 000 end
+
     property var rectangleList: []
     property var articleModel: gridViewModel
 
@@ -18,6 +43,7 @@
 
     Component.onCompleted: {
         prepareComponents()
+        canReload = true
     }
 
     property var delegateComponents: []
@@ -75,7 +101,8 @@
         if (amountToGo <= 0)
             return
 
-        var numAdd = amountToGo > 12 ? 12 : amountToGo
+        // change 12 to numberAddMore
+        var numAdd = amountToGo > numberAddMore ? numberAddMore : amountToGo
 
         console.time("loadmore")
 
@@ -118,6 +145,7 @@
         currentLoadedIndex = 0
         loadMoreItems()
         organicFlickable.scrollToStart()
+        canReload = true
     }
 
     /*!
 
=== modified file 'rssreader-app.qmlproject'
--- rssreader-app.qmlproject	2013-09-26 08:44:17 +0000
+++ rssreader-app.qmlproject	2014-02-14 09:22:48 +0000
@@ -3,7 +3,7 @@
 import QmlProject 1.1
 
 Project {
-    mainFile: "rssreader-app.qml"
+    mainFile: "shorts-app.qml"
 
     /* Include .qml, .js, and image files from current directory and subdirectories */
     QmlFiles {