Prepared WebEngine port and resize according to content

8 files changed, 95 insertions, 53 deletions

diff --git a/applications/mail/CMakeLists.txt b/applications/mail/CMakeLists.txt
index 97e418b6..7c6fe755 100644
--- a/applications/mail/CMakeLists.txt
+++ b/applications/mail/CMakeLists.txt
@@ -18,14 +18,14 @@ include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings)
 
-find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets)
+find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets WebEngine)
 
-set (QT_MIN_VERSION "5.4.0")
+set (QT_MIN_VERSION "5.6.0")
 find_package(KF5 REQUIRED COMPONENTS Package)
 
 # install executable
 add_executable(${PROJECT_NAME} main.cpp)
-qt5_use_modules(${PROJECT_NAME} Gui Quick Widgets)
+qt5_use_modules(${PROJECT_NAME} Gui Quick Widgets WebEngine)
 target_link_libraries(${PROJECT_NAME} KF5::Package)
 
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)
diff --git a/applications/mail/main.cpp b/applications/mail/main.cpp
index 26353aa4..cb5350a2 100644
--- a/applications/mail/main.cpp
+++ b/applications/mail/main.cpp
@@ -5,6 +5,7 @@
 #include <KPackage/PackageLoader>
 #include <QQuickImageProvider>
 #include <QIcon>
+#include <QtWebEngine>
 
 #include <QDebug>
 
@@ -34,6 +35,7 @@ public:
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
+    QtWebEngine::initialize();
     auto package = KPackage::PackageLoader::self()->loadPackage("KPackage/GenericQML", "org.kube.components.mail");
     Q_ASSERT(package.isValid());
     QQmlApplicationEngine engine;
diff --git a/components/package/contents/ui/ContentView.qml b/components/package/contents/ui/ContentView.qml
index d4ddabce..a8f4c437 100644
--- a/components/package/contents/ui/ContentView.qml
+++ b/components/package/contents/ui/ContentView.qml
@@ -1,6 +1,5 @@
 import QtQuick 2.4
 import QtQuick.Controls 1.3
-import QtWebKit 3.0
 
 Item {
     id: root
@@ -8,7 +7,8 @@ Item {
     property bool isHtml;
     property string content;
     property string contentType;
-    height: contentRect.height
+    property int contentWidth: contentLoader.item.contentWidth
+    property int contentHeight: contentLoader.item.contentHeight
     Rectangle {
         id: contentRect
 
@@ -17,61 +17,26 @@ Item {
         // border.color: "black"
         // radius: 5
         // anchors.leftMargin: nestingLevel * 5
-
-        height: contentLoader.height
-        width: root.width
+        anchors.fill: parent
 
         Loader {
             id: contentLoader
-            anchors.top: contentRect.top
-            anchors.left: contentRect.left
-            width: contentRect.width
+            property string content: root.content
+            anchors.fill: parent
             sourceComponent: isHtml ? htmlComponent : textComponent
-            height: isHtml ? item.flickableItem.contentHeight : text.height
-            onStatusChanged: {
-                if (isHtml) {
-                    item.flickableItem.loadHtml(root.content, "file:///");
-                }
-            }
         }
 
         Component {
             id: textComponent
-            Text {
-                id: text
-                text: content
+            TextView {
+                content: root.content
             }
         }
         Component {
             id: htmlComponent
-            //We need the scrollview so the WebView can fully expand so we have access to the contentHeight
-            //Otherwise it would just scale the content.
-            ScrollView {
-                horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-                verticalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-                WebView {
-                    id: htmlView
-                    onNavigationRequested: {
-                        // detect URL scheme prefix, most likely an external link
-                        var schemaRE = /^\w+:/;
-                        if (schemaRE.test(request.url)) {
-                            request.action = WebView.AcceptRequest;
-                        } else {
-                            request.action = WebView.IgnoreRequest;
-                            // delegate request.url here
-                        }
-                    }
-                    onLoadingChanged: {
-                        console.warn("Error is ", loadRequest.errorString);
-                        console.warn("Status is ", loadRequest.status);
-                    }
-                }
+            WebView {
+                content: root.content
             }
         }
     }
-    onContentChanged: {
-        if (isHtml) {
-            contentLoader.item.flickableItem.loadHtml(content, "file:///");
-        }
-    }
 }
diff --git a/components/package/contents/ui/MailListView.qml b/components/package/contents/ui/MailListView.qml
index bc292705..d0278833 100644
--- a/components/package/contents/ui/MailListView.qml
+++ b/components/package/contents/ui/MailListView.qml
@@ -31,6 +31,10 @@ Controls.ScrollView {
     property variant currentMail
     property bool isDraft : false
 
+    onParentFolderChanged: {
+        currentMail = null
+    }
+
     ListView {
         id: listView
 
diff --git a/components/package/contents/ui/MailViewer.qml b/components/package/contents/ui/MailViewer.qml
index d62daaf2..53808ddd 100644
--- a/components/package/contents/ui/MailViewer.qml
+++ b/components/package/contents/ui/MailViewer.qml
@@ -26,12 +26,13 @@ Item {
                 spacing:2
                 MessagePartTree {
                     id: topPartLoader
-                    width: rootRectangle.width
-                    height: topPartLoader.desiredHeight
+                    // width: rootRectangle.width
+                    height: topPartLoader.contentHeight
+                    width: topPartLoader.contentWidth >= rootRectangle.width ? topPartLoader.contentWidth : rootRectangle.width
                 }
                 TreeView {
                     visible: enablePartTreeView
-                    width: 500
+                    width: rootRectangle.width
                     height: 400
                     TableViewColumn {
                         role: "type"
diff --git a/components/package/contents/ui/MessagePartTree.qml b/components/package/contents/ui/MessagePartTree.qml
index d44a1e5e..8bc13e6e 100644
--- a/components/package/contents/ui/MessagePartTree.qml
+++ b/components/package/contents/ui/MessagePartTree.qml
@@ -5,7 +5,8 @@ Item {
     id: root
     property alias rootIndex: visualModel.rootIndex
     property int nestingLevel: 0
-    property int desiredHeight: messagePartRect.height
+    property int contentHeight: messagePartRect.height
+    property int contentWidth: 0
     Rectangle {
         id: messagePartRect
         height: partListView.contentHeight
@@ -24,6 +25,7 @@ Item {
                     anchors.top: delegateRect.top
                     anchors.left: delegateRect.left
                     width: messagePartRect.width
+                    height: contentHeight
                     content: model.text
                     isHtml: model.isHtml
                     visible: model.hasContent
@@ -33,16 +35,19 @@ Item {
                             height = 0
                         }
                     }
+                    onContentWidthChanged: {
+                        root.contentWidth = contentWidth > root.contentWidth ? contentWidth : root.contentWidth
+                    }
                     contentType: model.type
                 }
                 Loader {
                     id: partLoader
                     anchors.top: contentView.bottom
                     anchors.left: contentView.left
-                    width: messagePartRect.width
                     visible: model.hasModelChildren
                     active: model.hasModelChildren
-                    height: item ? item.desiredHeight : 0
+                    height: item ? item.contentHeight : 0
+                    width: messagePartRect.width
                 }
                 Component.onCompleted: {
                     if (model.hasModelChildren) {
diff --git a/components/package/contents/ui/TextView.qml b/components/package/contents/ui/TextView.qml
new file mode 100644
index 00000000..7c2f3153
--- /dev/null
+++ b/components/package/contents/ui/TextView.qml
@@ -0,0 +1,15 @@
+import QtQuick 2.4
+import QtQuick.Controls 1.3
+
+Item {
+    id: root
+    property string content;
+    property int contentWidth: 0;
+    property int contentHeight: textView.contentHeight;
+    Text {
+        id: textView
+        wrapMode: Text.WordWrap
+        anchors.fill: parent
+        text: content
+    }
+}
diff --git a/components/package/contents/ui/WebView.qml b/components/package/contents/ui/WebView.qml
new file mode 100644
index 00000000..fe3a8bcd
--- /dev/null
+++ b/components/package/contents/ui/WebView.qml
@@ -0,0 +1,50 @@
+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
+
+Item {
+    id: root
+    property string content;
+    // property int contentWidth: 500;
+    // property int contentHeight: 500;
+    property int contentWidth: htmlView.contentWidth;
+    property int contentHeight: htmlView.contentHeight;
+    // width: htmlView.width
+    // height: htmlView.height
+    WebView {
+        id: htmlView
+        anchors.top: parent.top
+        anchors.horizontalCenter: parent.horizontalCenter
+        width: contentWidth
+        height: contentHeight
+        onNavigationRequested: {
+            // detect URL scheme prefix, most likely an external link
+            var schemaRE = /^\w+:/;
+            if (schemaRE.test(request.url)) {
+                request.action = WebView.AcceptRequest;
+            } else {
+                request.action = WebView.IgnoreRequest;
+                // delegate request.url here
+            }
+        }
+        onLoadingChanged: {
+            console.warn("Error is ", loadRequest.errorString);
+            console.warn("Status is ", loadRequest.status);
+        }
+        Component.onCompleted: loadHtml(content, "file:///")
+    }
+    // WebEngineView {
+    //     id: htmlView
+    //     anchors.fill: parent
+    //     onLoadingChanged: {
+    //         console.warn("Error is ", loadRequest.errorString);
+    //         console.warn("Status is ", loadRequest.status);
+    //     }
+    //     Component.onCompleted: loadHtml(content, "file:///")
+    // }
+    onContentChanged: {
+        htmlView.loadHtml(content, "file:///");
+    }
+}