diff options
| author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-10-02 12:25:15 +0300 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-11-22 10:43:01 +0000 |
| commit | a0857629b3adf8247946e7cc0ae6d4561925587e (patch) | |
| tree | 2b3492bf5dae934fbdfd198a0a33d0b0393633c9 | |
| parent | 88f5014e955433ec407ca7d2a847daf3e454952f (diff) | |
Make demo description flickable
Task-number: QTBUG-63091
Change-Id: I707848649a4a332116b7cacfee27e048bf4f576b
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
| -rw-r--r-- | qml/DetailView.qml | 72 |
1 files changed, 40 insertions, 32 deletions
diff --git a/qml/DetailView.qml b/qml/DetailView.qml index 119caaf..0e02949 100644 --- a/qml/DetailView.qml +++ b/qml/DetailView.qml @@ -50,45 +50,53 @@ Item { source: "" } - Column { - id: descriptionHolder + Flickable { anchors.left: parent.left anchors.right: largeImg.left - anchors.margins: viewSettings.pageMargin * 0.5 + anchors.top: parent.top + anchors.bottom: startButton.top + anchors.bottomMargin: viewSettings.pageMargin * 0.5 anchors.rightMargin: viewSettings.pageMargin - spacing: viewSettings.pageMargin * 0.5 - - Text{ - id: descriptionTitle - font.pixelSize: detailInformation.height * 0.11 - width: descriptionHolder.width - text: "Demo Title" - color: "white" - font.family: viewSettings.appFont - font.styleName: "SemiBold" - wrapMode: Text.WordWrap - } + contentHeight: descriptionHolder.height + contentWidth: width + clip: true + + Column { + id: descriptionHolder + width: parent.width + + spacing: viewSettings.pageMargin * 0.5 + + Text { + id: descriptionTitle + font.pixelSize: detailInformation.height * 0.11 + width: descriptionHolder.width + text: "Demo Title" + color: "white" + font.family: viewSettings.appFont + font.styleName: "SemiBold" + wrapMode: Text.WordWrap + } - Rectangle { - id: btmLine - width: parent.width * 0.5 - height: 2 + Rectangle { + id: btmLine + width: parent.width * 0.5 + height: 2 + } + + Text { + id: descriptionText + anchors.margins: viewSettings.pageMargin * 0.5 + font.pixelSize: detailInformation.height * 0.05 + font.family: viewSettings.appFont + width: descriptionHolder.width + wrapMode: Text.WordWrap + color: "white" + elide: Text.ElideRight + } } } - Text { - id: descriptionText - anchors.top: descriptionHolder.bottom - anchors.bottom: startButton.top - anchors.left: parent.left - anchors.margins: viewSettings.pageMargin * 0.5 - font.pixelSize: detailInformation.height * 0.05 - font.family: viewSettings.appFont - width: descriptionHolder.width - wrapMode: Text.WordWrap - color: "white" - elide: Text.ElideRight - } QtButton { id: startButton height: detailInformation.height * 0.14 |