Merge lp:~qqworini/ubuntu-rssreader-app/optimize-grid-item into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Joey Chan]

optimize image performance in grid item

optimize image performance in grid item

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

FAILED: Continuous integration, rev:62
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/39/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/297
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/39
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/39
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/39
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/39

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

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'article_items/ArticleFullImg.qml'
--- article_items/ArticleFullImg.qml	2013-09-06 07:27:18 +0000
+++ article_items/ArticleFullImg.qml	2013-09-07 11:29:39 +0000
@@ -30,8 +30,13 @@
             radius: "medium"
             image: Image {
                 id: pic
-                width: u_pic.width
+                width: {
+                    if (implicitHeight < 50 || implicitWidth < 50) return 0
+                    else return u_pic.width
+                }
+                height: width * implicitHeight / implicitWidth
                 source: imageArray[0]
+                sourceSize.width: u_pic.width
             }
         }
     }

=== modified file 'article_items/ArticleOneImgA.qml'
--- article_items/ArticleOneImgA.qml	2013-09-06 07:27:18 +0000
+++ article_items/ArticleOneImgA.qml	2013-09-07 11:29:39 +0000
@@ -31,9 +31,13 @@
             radius: "medium"
             image: Image {
                 id: pic
-                width: u_pic.width
-                fillMode: Image.PreserveAspectFit
+                width: {
+                    if (implicitHeight < 50 || implicitWidth < 50) return 0
+                    else return u_pic.width
+                }
+                height: width * implicitHeight / implicitWidth
                 source: imageArray[0]
+                sourceSize.width: u_pic.width
             }
         }
 
@@ -93,7 +97,7 @@
             if (dbResult.rowsAffected == 1) {
                 rss_item.status = "1"
             }
-            mainView.toRssPage(rss_model, model_index) ;
+            mainView.toRssPage(rss_model, model_index) 
         }
     }
 }