rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a few null warnings

This commit is contained in:
Nicolas Werner 2021-08-29 19:24:44 +02:00
parent fc7df50d9a
commit ded926cdf9
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resources/qml/MessageView.qml
View File

@ -33,7 +33,7 @@ ScrollView {
verticalLayoutDirection: ListView.BottomToTop
onCountChanged: {
// Mark timeline as read
if (atYEnd)
if (atYEnd && room)
model.currentIndex = 0;
}
@ -233,8 +233,8 @@ ScrollView {
id: dateBubble
anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined
visible: previousMessageDay !== day
text: chat.model.formatDateSeparator(timestamp)
visible: room && previousMessageDay !== day
text: room ? room.formatDateSeparator(timestamp) : ""
color: Nheko.colors.text
height: Math.round(fontMetrics.height * 1.4)
width: contentWidth * 1.2
@ -257,10 +257,10 @@ ScrollView {
width: Nheko.avatarSize
height: Nheko.avatarSize
url: chat.model.avatarUrl(userId).replace("mxc://", "image://MxcImage/")
url: !room ? "" : room.avatarUrl(userId).replace("mxc://", "image://MxcImage/")
displayName: userName
userid: userId
onClicked: chat.model.openUserProfile(userId)
onClicked: room.openUserProfile(userId)
ToolTip.visible: avatarHover.hovered
ToolTip.text: userid

9
resources/qml/TimelineView.qml
View File

@ -84,11 +84,10 @@ Item {
target: timelineView
}
MessageView {
implicitHeight: msgView.height - typingIndicator.height
Layout.fillWidth: true
}
MessageView {
implicitHeight: msgView.height - typingIndicator.height
Layout.fillWidth: true
}
Loader {
source: CallManager.isOnCall && CallManager.callType != CallType.VOICE ? "voip/VideoCall.qml" : ""

1
resources/qml/dialogs/ImagePackEditorDialog.qml
View File

@ -279,7 +279,6 @@ ApplicationWindow {
Layout.alignment: Qt.AlignRight
}
Item {
Layout.columnSpan: 2
Layout.fillHeight: true