psa: Full width articles

[feedingit] / psa_harmattan / feedingit / deb_dist / feedingit-0.1.0 / debian / feedingit / usr / share / feedingit / qml / ArticleDisplay.qml

diff --git a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/ArticleDisplay.qml b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/ArticleDisplay.qml
index 1e5e98a..e014865 100644 (file)
--- a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/ArticleDisplay.qml
+++ b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/debian/feedingit/usr/share/feedingit/qml/ArticleDisplay.qml
@@ -4,7 +4,7 @@ import "common" as Common
 
 Rectangle {
     /*x: parent.width; height: parent.height;*/
-    width: parent.width;
+    width: flickable.width;
     height: parent.height
     property alias zoomEnabled: slider.visible;
     property alias value: slider.value;
@@ -15,7 +15,7 @@ Rectangle {
         id: flickable
         //anchors.fill: screen;
         height: parent.height;
-        width: parent.width;
+        width: webView.width;
         contentWidth: webView.width*webView.scale; //Math.max(screen.width,webView.width*webView.scale)
         contentHeight: Math.max(articleViewer.height,webView.height*webView.scale)
         //contentWidth: childrenRect.width; contentHeight: childrenRect.height
@@ -27,12 +27,12 @@ Rectangle {
             id: webView
             //url: flipItem.url;
             html: flipItem.html;
-            preferredWidth: flickable.width
-            preferredHeight: flickable.height
+            preferredWidth: articleView.width
+            //preferredHeight: articleView.height
             //scale: 1.25;
             transformOrigin: Item.TopLeft
             scale: slider.value;
-            settings.defaultFontSize: 24
+            //settings.defaultFontSize: 24
         }
 
 //        onFlickStarted: {