4 files changed, 5 insertions, 5 deletions
diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index 7ed30112..b70335bb 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -363,7 +363,7 @@ ScrollView {
anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined
width: chat.delegateMaxWidth
- height: Math.max(section.active ? section.height + timelinerow.height : timelinerow.height, 10)
+ height: section.active ? section.height + timelinerow.height : timelinerow.height
Rectangle {
id: scrollHighlight
@@ -420,7 +420,7 @@ ScrollView {
property string day: wrapper.day
property string previousMessageDay: wrapper.previousMessageDay
property string userName: wrapper.userName
- property var timestamp: wrapper.timestamp
+ property date timestamp: wrapper.timestamp
z: 4
active: previousMessageUserId !== undefined && previousMessageUserId !== userId || previousMessageDay !== day
diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml
index 9f889106..5f560505 100644
--- a/resources/qml/delegates/MessageDelegate.qml
+++ b/resources/qml/delegates/MessageDelegate.qml
@@ -34,7 +34,7 @@ Item {
required property int encryptionError
required property int relatedEventCacheBuster
- height: Math.max(chooser.child.height, 20)
+ height: chooser.child ? chooser.child.height : Nheko.paddingLarge
DelegateChooser {
id: chooser
diff --git a/resources/qml/dialogs/LogoutDialog.qml b/resources/qml/dialogs/LogoutDialog.qml
index eb82dd15..c571a89e 100644
--- a/resources/qml/dialogs/LogoutDialog.qml
+++ b/resources/qml/dialogs/LogoutDialog.qml
@@ -14,6 +14,6 @@ MessageDialog {
text: CallManager.isOnCall ? qsTr("A call is in progress. Log out?") : qsTr("Are you sure you want to log out?")
modality: Qt.WindowModal
flags: Qt.Tool | Qt.WindowStaysOnTopHint | Qt.WindowCloseButtonHint | Qt.WindowTitleHint
- buttons: Dialog.Ok | Dialog.Cancel
+ buttons: MessageDialog.Ok | MessageDialog.Cancel
onAccepted: Nheko.logout()
}
diff --git a/resources/qml/dialogs/RoomSettings.qml b/resources/qml/dialogs/RoomSettings.qml
index 0e7749ce..b0f7730b 100644
--- a/resources/qml/dialogs/RoomSettings.qml
+++ b/resources/qml/dialogs/RoomSettings.qml
@@ -239,7 +239,7 @@ ApplicationWindow {
onRejected: {
encryptionToggle.checked = false;
}
- buttons: Dialog.Ok | Dialog.Cancel
+ buttons: Platform.MessageDialog.Ok | Platform.MessageDialog.Cancel
}
MatrixText {
|
