From ac1b1a99023ced552bb137ed3bce15715d593b25 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 8 Apr 2019 14:11:25 +0200 Subject: [PATCH] Use ScrollableTextArea in whats new page CURA-6057 --- .../qml/WelcomePages/WhatsNewContent.qml | 29 +++++-------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/resources/qml/WelcomePages/WhatsNewContent.qml b/resources/qml/WelcomePages/WhatsNewContent.qml index db6cd3b576..415acae05c 100644 --- a/resources/qml/WelcomePages/WhatsNewContent.qml +++ b/resources/qml/WelcomePages/WhatsNewContent.qml @@ -27,8 +27,10 @@ Item renderType: Text.NativeRendering } - Rectangle + Cura.ScrollableTextArea { + id: whatsNewTextArea + anchors.top: titleLabel.bottom anchors.bottom: getStartedButton.top anchors.topMargin: UM.Theme.getSize("wide_margin").height @@ -36,27 +38,12 @@ Item anchors.left: parent.left anchors.right: parent.right - border.color: "#dfdfdf" - border.width: UM.Theme.getSize("default_lining").width + ScrollBar.horizontal.policy: ScrollBar.AlwaysOff - ScrollView - { - anchors.fill: parent - anchors.margins: UM.Theme.getSize("default_lining").width - - ScrollBar.horizontal.policy: ScrollBar.AlwaysOff - - TextArea - { - id: whatsNewTextArea - text: CuraApplication.getTextManager().getChangeLogText() - textFormat: Text.RichText - wrapMode: Text.WordWrap - readOnly: true - font: UM.Theme.getFont("default") - renderType: Text.NativeRendering - } - } + textArea.text: CuraApplication.getTextManager().getChangeLogText() + textArea.textFormat: Text.RichText + textArea.wrapMode: Text.WordWrap + textArea.readOnly: true } Cura.PrimaryButton