From c96109e9b7bd34565b601f9e560a4c20402236fc Mon Sep 17 00:00:00 2001 From: Devin Lin Date: Wed, 23 Dec 2020 08:53:09 +0000 Subject: [PATCH] Fix room header text alignment and add support for two line room descriptions (cherry picked from commit 93f35faf9587cf72b4c6eaecf100bbf259cce0a8) --- imports/NeoChat/Page/RoomPage.qml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/imports/NeoChat/Page/RoomPage.qml b/imports/NeoChat/Page/RoomPage.qml index e9b9a9d06..8a152a11f 100644 --- a/imports/NeoChat/Page/RoomPage.qml +++ b/imports/NeoChat/Page/RoomPage.qml @@ -35,23 +35,26 @@ Kirigami.ScrollablePage { Layout.fillWidth: true Layout.maximumWidth: implicitWidth + 1 // The +1 is to make sure we do not trigger eliding at max width Layout.minimumWidth: 0 + spacing: Kirigami.Units.gridUnit * 0.8 Kirigami.Heading { - level: 1 + id: titleLabel + level: 2 + Layout.alignment: Qt.AlignVCenter text: page.title opacity: page.isCurrentPage ? 1 : 0.4 maximumLineCount: 1 elide: Text.ElideRight - Layout.leftMargin: Kirigami.Units.largeSpacing - Layout.alignment: Qt.AlignBottom } QQC2.Label { - Layout.alignment: Qt.AlignBottom - text: currentRoom.topic Layout.fillWidth: true - maximumLineCount: 1 - //wrapMode: Text.WordWrap + Layout.alignment: Qt.AlignVCenter + anchors.baseline: lineCount < 2 ? titleLabel.baseline : undefined // necessary, since there is no way to do this with Layout.alignment + text: currentRoom.topic + maximumLineCount: 2 + wrapMode: Text.Wrap elide: Text.ElideRight color: Kirigami.Theme.disabledTextColor + font.pointSize: Kirigami.Theme.defaultFont.pointSize * 0.9 } } }