projects
/
feedingit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psa: using 2 flickables
[feedingit]
/
psa_harmattan
/
feedingit
/
deb_dist
/
feedingit-0.1.0
/
qml
/
ArticleDisplay.qml
diff --git
a/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/ArticleDisplay.qml
b/psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/ArticleDisplay.qml
index
e014865
..
638fefb
100644
(file)
--- a/
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/ArticleDisplay.qml
+++ b/
psa_harmattan/feedingit/deb_dist/feedingit-0.1.0/qml/ArticleDisplay.qml
@@
-17,7
+17,7
@@
Rectangle {
height: parent.height;
width: webView.width;
contentWidth: webView.width*webView.scale; //Math.max(screen.width,webView.width*webView.scale)
height: parent.height;
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)
+ contentHeight: Math.max(articleView.height,webView.height*webView.scale)
//contentWidth: childrenRect.width; contentHeight: childrenRect.height
interactive: parent.vertPanningEnabled;
//contentWidth: childrenRect.width; contentHeight: childrenRect.height
interactive: parent.vertPanningEnabled;
@@
-32,7
+32,7
@@
Rectangle {
//scale: 1.25;
transformOrigin: Item.TopLeft
scale: slider.value;
//scale: 1.25;
transformOrigin: Item.TopLeft
scale: slider.value;
- //settings.defaultFontSize: 24
+ settings.defaultFontSize: articleView.webviewFontSize
}
// onFlickStarted: {
}
// onFlickStarted: {