diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-08-25 21:03:05 +0200 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-08-25 21:03:05 +0200 |
| commit | 55107ed0ce6d457b82fa2e64878712198a6c0f1f (patch) | |
| tree | 77e032526bf6ebb4ea188acff426358e779a661e /resources | |
| parent | Reimplement reply delegate by moving out the timeline event without layout (diff) | |
| download | nheko-55107ed0ce6d457b82fa2e64878712198a6c0f1f.tar.xz | |
Fix some reply layouting loops
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/qml/ForwardCompleter.qml | 2 | ||||
| -rw-r--r-- | resources/qml/ReplyPopup.qml | 2 | ||||
| -rw-r--r-- | resources/qml/TopBar.qml | 2 | ||||
| -rw-r--r-- | resources/qml/delegates/Reply.qml | 6 |
4 files changed, 5 insertions, 7 deletions
diff --git a/resources/qml/ForwardCompleter.qml b/resources/qml/ForwardCompleter.qml index 6f95c663..caaea440 100644 --- a/resources/qml/ForwardCompleter.qml +++ b/resources/qml/ForwardCompleter.qml @@ -56,7 +56,7 @@ Popup { eventId: mid userColor: TimelineManager.userColor(modelData.userId, palette.window) - width: parent.width + maxWidth: parent.width } MatrixTextField { id: roomTextInput diff --git a/resources/qml/ReplyPopup.qml b/resources/qml/ReplyPopup.qml index 64c58e56..5657c08a 100644 --- a/resources/qml/ReplyPopup.qml +++ b/resources/qml/ReplyPopup.qml @@ -32,7 +32,7 @@ Rectangle { eventId: room.reply ?? "" userColor: TimelineManager.userColor(modelData.userId, palette.window) visible: room && room.reply - width: parent.width + maxWidth: parent.width - anchors.leftMargin - anchors.rightMargin } ImageButton { id: closeReplyButton diff --git a/resources/qml/TopBar.qml b/resources/qml/TopBar.qml index 4c70348b..aba91763 100644 --- a/resources/qml/TopBar.qml +++ b/resources/qml/TopBar.qml @@ -285,7 +285,7 @@ Pane { property var e: room ? room.getDump(modelData, "pins") : {} - Layout.fillWidth: true + maxWidth: pinnedMessages.width //Layout.preferredHeight: height eventId: e.eventId ?? "" userColor: TimelineManager.userColor(e.userId, palette.window) diff --git a/resources/qml/delegates/Reply.qml b/resources/qml/delegates/Reply.qml index 55a376f7..52cc982d 100644 --- a/resources/qml/delegates/Reply.qml +++ b/resources/qml/delegates/Reply.qml @@ -24,6 +24,7 @@ AbstractButton { property string userName: eventId ? room.dataById(eventId, Room.UserName, "") : "" implicitHeight: replyContainer.implicitHeight implicitWidth: replyContainer.implicitWidth + property int maxWidth NhekoCursorShape { anchors.fill: parent @@ -48,14 +49,11 @@ AbstractButton { eventId: r.eventId replyTo: "" - width: parent.width - height: replyContainer.implicitHeight - //height: replyContainer.implicitHeight data: GridLayout { id: replyContainer - width: parent.width + width: r.maxWidth columns: 2 rows: 2 columnSpacing: Nheko.paddingMedium |