From 2f21bd8227384f88c535f605431e94011264a3fa Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Sat, 19 Aug 2017 20:22:15 -0600 Subject: A column with one item doesn't make much sense --- components/mailviewer/contents/ui/TextContent.qml | 37 ++++++++++------------- 1 file changed, 16 insertions(+), 21 deletions(-) (limited to 'components/mailviewer') diff --git a/components/mailviewer/contents/ui/TextContent.qml b/components/mailviewer/contents/ui/TextContent.qml index b3f0ee69..5d8dbc90 100644 --- a/components/mailviewer/contents/ui/TextContent.qml +++ b/components/mailviewer/contents/ui/TextContent.qml @@ -27,10 +27,10 @@ Item { property bool embedded: true property string type - height: textColumn.height + height: textEdit.height - Column { - id: textColumn + TextEdit { + id: textEdit anchors { top: parent.top @@ -38,28 +38,23 @@ Item { right: parent.right } - spacing: 5 + selectionColor: Kube.Colors.highlightColor - TextEdit { - width: parent.width - selectionColor: Kube.Colors.highlightColor + readOnly: true + selectByMouse: true - readOnly: true - selectByMouse: true + text: content + wrapMode: TextEdit.Wrap + textFormat: Text.RichText - text: content - wrapMode: TextEdit.Wrap - textFormat: Text.RichText + font.family: Kube.Font.fontFamily + color: embedded ? Kube.Colors.disabledTextColor : Kube.Colors.textColor + onLinkActivated: Qt.openUrlExternally(link) - font.family: Kube.Font.fontFamily - color: embedded ? Kube.Colors.disabledTextColor : Kube.Colors.textColor - onLinkActivated: Qt.openUrlExternally(link) - - MouseArea { - anchors.fill: parent - acceptedButtons: Qt.NoButton // we don't want to eat clicks on the Text - cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor - } + MouseArea { + anchors.fill: parent + acceptedButtons: Qt.NoButton // we don't want to eat clicks on the Text + cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor } } } -- cgit v1.2.3