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

Fix a few null warnings

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

9
resources/qml/TimelineView.qml
View file

@ -84,11 +84,10 @@ Item {
target: timelineView target: timelineView
} }
MessageView {
MessageView { implicitHeight: msgView.height - typingIndicator.height
implicitHeight: msgView.height - typingIndicator.height Layout.fillWidth: true
Layout.fillWidth: true }
}
Loader { Loader {
source: CallManager.isOnCall && CallManager.callType != CallType.VOICE ? "voip/VideoCall.qml" : "" 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 Layout.alignment: Qt.AlignRight
} }
Item { Item {
Layout.columnSpan: 2 Layout.columnSpan: 2
Layout.fillHeight: true Layout.fillHeight: true