From ccf7a142dbacd19657cea11a216784f1a9c7f733 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 18 Nov 2020 12:01:35 +0200 Subject: startupscreen: use TextArea Use TextArea now that QTBUG-88169 has been fixed and touch work correctly. Change-Id: Ib35cca0448407dd6c7a4c1c096f4340f965db8e2 Reviewed-by: Assam Boudjelthia --- startupscreen/GuideView.qml | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/startupscreen/GuideView.qml b/startupscreen/GuideView.qml index 0170e1b..fb6dd2e 100644 --- a/startupscreen/GuideView.qml +++ b/startupscreen/GuideView.qml @@ -65,35 +65,14 @@ Item { contentHeight: guide.height flickableDirection: Flickable.VerticalFlick - // dummy component to access current style TextArea { - id: textarea - visible: false - readOnly: true - } - - // Get background from TextArea - Rectangle { - anchors.fill: parent - border.width: textarea.background.border.width - border.color: textarea.background.border.color - color: textarea.background.color - } - - Text { id: guide width: root.width text: SettingsManager.guideText textFormat: Text.RichText wrapMode: Text.WordWrap - - // Get style from TextArea - font: textarea.font - color: textarea.color - padding: textarea.padding - topPadding: textarea.topPadding - rightPadding: textarea.rightPadding - bottomPadding: textarea.bottomPadding + readOnly: true + focus: root.visible } } -- cgit v1.2.3