Skip to content
Snippets Groups Projects
Verified Commit 55107ed0 authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Fix some reply layouting loops

parent b187440e
No related branches found
No related tags found
No related merge requests found
...@@ -56,7 +56,7 @@ Popup { ...@@ -56,7 +56,7 @@ Popup {
eventId: mid eventId: mid
userColor: TimelineManager.userColor(modelData.userId, palette.window) userColor: TimelineManager.userColor(modelData.userId, palette.window)
width: parent.width maxWidth: parent.width
} }
MatrixTextField { MatrixTextField {
id: roomTextInput id: roomTextInput
......
...@@ -32,7 +32,7 @@ Rectangle { ...@@ -32,7 +32,7 @@ Rectangle {
eventId: room.reply ?? "" eventId: room.reply ?? ""
userColor: TimelineManager.userColor(modelData.userId, palette.window) userColor: TimelineManager.userColor(modelData.userId, palette.window)
visible: room && room.reply visible: room && room.reply
width: parent.width maxWidth: parent.width - anchors.leftMargin - anchors.rightMargin
} }
ImageButton { ImageButton {
id: closeReplyButton id: closeReplyButton
......
...@@ -285,7 +285,7 @@ Pane { ...@@ -285,7 +285,7 @@ Pane {
property var e: room ? room.getDump(modelData, "pins") : {} property var e: room ? room.getDump(modelData, "pins") : {}
Layout.fillWidth: true maxWidth: pinnedMessages.width
//Layout.preferredHeight: height //Layout.preferredHeight: height
eventId: e.eventId ?? "" eventId: e.eventId ?? ""
userColor: TimelineManager.userColor(e.userId, palette.window) userColor: TimelineManager.userColor(e.userId, palette.window)
......
...@@ -24,6 +24,7 @@ AbstractButton { ...@@ -24,6 +24,7 @@ AbstractButton {
property string userName: eventId ? room.dataById(eventId, Room.UserName, "") : "" property string userName: eventId ? room.dataById(eventId, Room.UserName, "") : ""
implicitHeight: replyContainer.implicitHeight implicitHeight: replyContainer.implicitHeight
implicitWidth: replyContainer.implicitWidth implicitWidth: replyContainer.implicitWidth
property int maxWidth
NhekoCursorShape { NhekoCursorShape {
anchors.fill: parent anchors.fill: parent
...@@ -48,14 +49,11 @@ AbstractButton { ...@@ -48,14 +49,11 @@ AbstractButton {
eventId: r.eventId eventId: r.eventId
replyTo: "" replyTo: ""
width: parent.width
height: replyContainer.implicitHeight
//height: replyContainer.implicitHeight //height: replyContainer.implicitHeight
data: GridLayout { data: GridLayout {
id: replyContainer id: replyContainer
width: parent.width width: r.maxWidth
columns: 2 columns: 2
rows: 2 rows: 2
columnSpacing: Nheko.paddingMedium columnSpacing: Nheko.paddingMedium
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment