From 7321af8a7d9cf01317b0a46c36eab25f2e95f5a8 Mon Sep 17 00:00:00 2001
From: kamathmanu <manuriddle@gmail.com>
Date: Sat, 14 Aug 2021 21:47:11 -0400
Subject: [PATCH] Cleanup more nits
---
resources/qml/RoomDirectory.qml | 27 ++++++++-------------------
1 file changed, 8 insertions(+), 19 deletions(-)
diff --git a/resources/qml/RoomDirectory.qml b/resources/qml/RoomDirectory.qml
index cd409bea5..129391a5e 100644
--- a/resources/qml/RoomDirectory.qml
+++ b/resources/qml/RoomDirectory.qml
@@ -14,8 +14,6 @@ ApplicationWindow {
property RoomDirectoryModel publicRooms
visible: true
- x: MainWindow.x + (MainWindow.width / 2) - (width / 2)
- y: MainWindow.y + (MainWindow.height / 2) - (height / 2)
minimumWidth: 650
minimumHeight: 420
palette: Nheko.colors
@@ -57,7 +55,7 @@ ApplicationWindow {
RowLayout {
spacing: Nheko.paddingMedium
anchors.fill: parent
- anchors.margins: Nheko.paddingMedium
+ anchors.margins: Nheko.paddingLarge
implicitHeight: textContent.height
Avatar {
@@ -76,22 +74,14 @@ ApplicationWindow {
Layout.alignment: Qt.AlignLeft
width: parent.width - avatar.width
Layout.preferredWidth: parent.width - avatar.width
- Layout.preferredHeight: roomNameRow.height + roomDescriptionRow.height
spacing: Nheko.paddingSmall
- RowLayout {
- id: roomNameRow
-
- spacing: 0
-
- ElidedLabel {
- Layout.alignment: Qt.AlignBottom
- color: roomDirDelegate.importantText
- elideWidth: textContent.width * 0.5 - Nheko.paddingMedium
- font.pixelSize: fontMetrics.font.pixelSize * 1.1
- fullText: model.name
- }
-
+ ElidedLabel {
+ Layout.alignment: Qt.AlignBottom
+ color: roomDirDelegate.importantText
+ elideWidth: textContent.width - numMembersRectangle.width - buttonRectangle.width
+ font.pixelSize: fontMetrics.font.pixelSize * 1.1
+ fullText: model.name
}
RowLayout {
@@ -106,7 +96,6 @@ ApplicationWindow {
id: roomTopic
color: roomDirDelegate.unimportantText
- font.weight: Font.Thin
Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
font.pixelSize: fontMetrics.font.pixelSize
elide: Text.ElideRight
@@ -163,7 +152,7 @@ ApplicationWindow {
footer: Item {
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width
- visible: (publicRooms.reachedEndOfPagination == false) && publicRooms.loadingMoreRooms
+ visible: !publicRooms.reachedEndOfPagination && publicRooms.loadingMoreRooms
// hacky but works
height: loadingSpinner.height + 2 * Nheko.paddingLarge
anchors.margins: Nheko.paddingLarge
--
GitLab