d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 03:00:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some reply layouting loops

Browse source
This commit is contained in:
Nicolas Werner 2023-08-25 21:03:05 +02:00
parent b187440e68
commit 55107ed0ce
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/ForwardCompleter.qml
View file

@ -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

2
resources/qml/ReplyPopup.qml
View file

@ -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

2
resources/qml/TopBar.qml
View file

@ -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)

6
resources/qml/delegates/Reply.qml
View file

@ -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 {
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