WebEngine only HtmlContent view

1 files changed, 17 insertions, 11 deletions

diff --git a/components/mailviewer/qml/HtmlContent.qml b/components/mailviewer/qml/HtmlContent.qml
index 15bd1915..15cb1843 100644
--- a/components/mailviewer/qml/HtmlContent.qml
+++ b/components/mailviewer/qml/HtmlContent.qml
@@ -18,31 +18,37 @@
 
 import QtQuick 2.4
 import QtQuick.Controls 1.3
-import QtWebKit 3.0
-// import QtWebEngine 1.3 //This would give use contentsSize
-import QtWebEngine 1.2
+import QtWebEngine 1.3
 
 Item {
     id: root
     property string content: model.content
-    property int contentHeight: helperView.contentHeight;
-    //FIXME workaround until QtWebEngine 1.3 with contentsSize
+    //We have to give it a minimum size so the html content starts to expand
+    property int contentHeight: 10;
 
     height: contentHeight
     width: partColumn.width
 
-    WebView {
-        id: helperView
-        visible: false
-        Component.onCompleted: loadHtml(content, "file:///")
-    }
     WebEngineView {
         id: htmlView
         anchors.fill: parent
         Component.onCompleted: loadHtml(content, "file:///")
+        onContentsSizeChanged: {
+            root.contentHeight = contentsSize.height;
+        }
+        onLoadingChanged: {
+            if (loadRequest.status === WebEngineView.LoadFailedStatus) {
+                console.warn("Failed to load html content.");
+                console.warn("Error is ", loadRequest.errorString);
+            }
+        }
+        settings {
+            autoLoadImages: true;
+            javascriptEnabled: false;
+            localStorageEnabled: false;
+        }
     }
     onContentChanged: {
         htmlView.loadHtml(content, "file:///");
-        helperView.loadHtml(content, "file:///");
     }
 }