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

Merge pull request #992 from maltee1/bubble_fixes

Browse source 
Bubble fixes
This commit is contained in:
DeepBlueV7.X 2022-03-13 16:07:01 +00:00 committed by GitHub
commit 71a7dace81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/MessageView.qml
View file

@ -256,7 +256,7 @@ Item {
Column { Column {
topPadding: userName_.visible? 4: 0 topPadding: userName_.visible? 4: 0
bottomPadding: Settings.bubbles? (isSender? 0 : 2) : 3 bottomPadding: Settings.bubbles? (isSender && previousMessageDay == day? 0 : 2) : 3
spacing: 8 spacing: 8
visible: (previousMessageUserId !== userId || previousMessageDay !== day || isStateEvent !== previousMessageIsStateEvent) visible: (previousMessageUserId !== userId || previousMessageDay !== day || isStateEvent !== previousMessageIsStateEvent)
width: parentWidth width: parentWidth

3
resources/qml/TimelineRow.qml
View file

@ -78,7 +78,7 @@ Item {
anchors.right: isStateEvent? undefined: (bubbleOnRight? parent.right : undefined) anchors.right: isStateEvent? undefined: (bubbleOnRight? parent.right : undefined)
anchors.horizontalCenter: isStateEvent? parent.horizontalCenter : undefined anchors.horizontalCenter: isStateEvent? parent.horizontalCenter : undefined
property int maxWidth: parent.width-anchors.leftMargin-anchors.rightMargin property int maxWidth: parent.width-anchors.leftMargin-anchors.rightMargin
width: Settings.bubbles? Math.min(maxWidth,implicitWidth+metadata.width+12) : maxWidth width: Settings.bubbles? Math.min(maxWidth,Math.max(reply.implicitWidth+8,contentItem.implicitWidth+metadata.width+20)) : maxWidth
leftPadding: 4 leftPadding: 4
rightPadding: (Settings.bubbles && !isStateEvent)? 4: 2 rightPadding: (Settings.bubbles && !isStateEvent)? 4: 2
topPadding: (Settings.bubbles && !isStateEvent)? 4: 2 topPadding: (Settings.bubbles && !isStateEvent)? 4: 2
@ -142,7 +142,6 @@ Item {
Layout.column: 0 Layout.column: 0
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: height Layout.preferredHeight: height
Layout.minimumWidth: 80
id: contentItem id: contentItem
blurhash: r.blurhash blurhash: r.blurhash