A working Html TextEditor

It's just the TextArea that is broken, it seems the TextEdit works fine
with html content.

1 files changed, 42 insertions, 9 deletions

diff --git a/framework/qml/TextEditor.qml b/framework/qml/TextEditor.qml
index e14e60b0..570bc322 100644
--- a/framework/qml/TextEditor.qml
+++ b/framework/qml/TextEditor.qml
@@ -18,7 +18,7 @@
  */
 
 import QtQuick 2.7
-import QtQuick.Controls 2.2
+import QtQuick.Controls 2
 
 import org.kube.framework 1.0 as Kube
 
@@ -44,29 +44,62 @@ FocusScope {
         document: edit.textDocument
         selectionStart: edit.selectionStart
         selectionEnd: edit.selectionEnd
-        //textColor: colorDialog.color
         onTextChanged: root.htmlEnabled ? root.text = htmlText : root.text = plainText
-
         cursorPosition: edit.cursorPosition
     }
 
-    Kube.ScrollHelper {
+
+    Rectangle {
         anchors.fill: parent
-        flickable: flickableItem
+        border.width: 1
+        border.color: root.activeFocus ? Kube.Colors.highlightColor : Kube.Colors.buttonColor
+        color: Kube.Colors.viewBackgroundColor
+
         Flickable {
             id: flickableItem
             anchors.fill: parent
             ScrollBar.vertical: Kube.ScrollBar {}
+            clip: true
+
+            Kube.ScrollHelper {
+                anchors.fill: parent
+                flickable: flickableItem
+            }
+
+            contentWidth: edit.paintedWidth
+            contentHeight: edit.paintedHeight
 
-            Kube.TextArea {
+            function ensureVisible(r) {
+                if (contentX >= r.x) {
+                    contentX = r.x
+                } else if (contentX+width <= r.x+r.width) {
+                    contentX = r.x+r.width-width;
+                }
+                if (contentY >= r.y) {
+                    contentY = r.y;
+                } else if (contentY+height <= r.y+r.height) {
+                    contentY = r.y+r.height-height;
+                }
+            }
+
+
+            TextEdit {
                 id: edit
+
+                width: flickableItem.width
+                height: flickableItem.height
+
                 focus: true
-                anchors.fill: parent
                 selectByMouse: true
-                wrapMode: TextEdit.Wrap
+                wrapMode: TextEdit.WordWrap
                 textFormat: root.htmlEnabled ? Qt.RichText : Qt.PlainText
+                onCursorRectangleChanged: flickableItem.ensureVisible(cursorRectangle)
+
+                color: Kube.Colors.textColor
+                font.family: Kube.Font.fontFamily
+                selectionColor: Kube.Colors.highlightColor
+                padding: Kube.Units.smallSpacing
             }
-            TextArea.flickable: edit
         }
     }
 }