From c7aa1cf9e8ea0109a74cce514f3c02e738bf4658 Mon Sep 17 00:00:00 2001 From: Alex Jbanca Date: Tue, 25 Jul 2023 18:31:55 +0300 Subject: [PATCH] fix(StatusQ): Allow two lines text content in StatusToastMessage --- .../sandbox/pages/StatusToastMessagePage.qml | 3 ++- .../StatusQ/Components/StatusToastMessage.qml | 16 +++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ui/StatusQ/sandbox/pages/StatusToastMessagePage.qml b/ui/StatusQ/sandbox/pages/StatusToastMessagePage.qml index f24aeb9f80..aeb91dbb49 100644 --- a/ui/StatusQ/sandbox/pages/StatusToastMessagePage.qml +++ b/ui/StatusQ/sandbox/pages/StatusToastMessagePage.qml @@ -19,7 +19,8 @@ Item { {"title":"Verification Request Sent", "subTitle":"", "icon":"checkmark-circle", "loading":false, "type":1,"url":"", "duration":4000}, {"title":"Collectible is being minted...", "subTitle":"View on Etherscan", "icon":"", "loading":true, "type":0,"url":"http://google.com", "duration":0}, {"title":"Contact request sent", "subTitle":"", "icon":"checkmark-circle", "loading":false, "type":1,"url":"", "duration":4000}, - {"title":"Test User", "subTitle":"Hello message...", "icon":"", "loading":false, "type":0,"url":"", "duration":4000} + {"title":"Test User", "subTitle":"Hello message...", "icon":"", "loading":false, "type":0,"url":"", "duration":4000}, + {"title":"This device is no longer the control node for the Socks Community", "subTitle":"", "icon":"info", "loading":false, "type":0,"url":"", "duration":0} ] delegate: StatusToastMessage { primaryText: modelData.title diff --git a/ui/StatusQ/src/StatusQ/Components/StatusToastMessage.qml b/ui/StatusQ/src/StatusQ/Components/StatusToastMessage.qml index 904fc0d747..232f74ba3e 100644 --- a/ui/StatusQ/src/StatusQ/Components/StatusToastMessage.qml +++ b/ui/StatusQ/src/StatusQ/Components/StatusToastMessage.qml @@ -38,7 +38,7 @@ import StatusQ.Core.Theme 0.1 Control { id: root width: 343 - height: !!secondaryText ? 68 : 48 + height: !!secondaryText || title.lineCount > 1 ? 68 : 48 anchors.right: parent.right /*! @@ -261,26 +261,32 @@ Control { } } } - Column { + ColumnLayout { Layout.fillWidth: true - Layout.alignment: Qt.AlignVCenter + Layout.fillHeight: true StatusBaseText { - width: parent.width + id: title + Layout.fillWidth: true font.pixelSize: 13 color: Theme.palette.directColor1 elide: Text.ElideRight + wrapMode: Text.Wrap text: root.primaryText + maximumLineCount: 2 } StatusBaseText { - width: parent.width + Layout.fillWidth: true visible: (!root.linkUrl && !!root.secondaryText) height: visible ? contentHeight : 0 font.pixelSize: 13 color: Theme.palette.baseColor1 text: root.secondaryText elide: Text.ElideRight + wrapMode: Text.Wrap + maximumLineCount: 2 } StatusSelectableText { + Layout.fillWidth: true visible: (!!root.linkUrl) height: visible ? implicitHeight : 0 font.pixelSize: 13