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

Fix date separator

Browse source
This commit is contained in:
Nicolas Werner 2022-10-07 11:11:07 +02:00
parent f2f9359f7f
commit a4524cd9af
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
resources/qml/MessageView.qml
View file

@ -406,7 +406,7 @@ Item {
required property bool isEditable required property bool isEditable
required property bool isEdited required property bool isEdited
required property bool isStateEvent required property bool isStateEvent
property bool previousMessageIsStateEvent: chat.model.dataByIndex(index+1, Room.IsStateEvent) property bool previousMessageIsStateEvent: (index + 1) >= chat.count ? true : chat.model.dataByIndex(index+1, Room.IsStateEvent)
required property string replyTo required property string replyTo
required property string threadId required property string threadId
required property string userId required property string userId
@ -420,9 +420,9 @@ Item {
required property int status required property int status
required property int index required property int index
required property int relatedEventCacheBuster required property int relatedEventCacheBuster
required property string day required property var day
property string previousMessageUserId: chat.model.dataByIndex(index+1, Room.UserId) property string previousMessageUserId: (index + 1) >= chat.count ? "" : chat.model.dataByIndex(index+1, Room.UserId)
property string previousMessageDay: chat.model.dataByIndex(index+1, Room.Day) property var previousMessageDay: (index + 1) >= chat.count ? 0 : chat.model.dataByIndex(index+1, Room.Day)
required property string userName required property string userName
property bool scrolledToThis: eventId === room.scrollTarget && (y + height > chat.y + chat.contentY && y < chat.y + chat.height + chat.contentY) property bool scrolledToThis: eventId === room.scrollTarget && (y + height > chat.y + chat.contentY && y < chat.y + chat.height + chat.contentY)
@ -436,8 +436,8 @@ Item {
property int parentWidth: parent.width property int parentWidth: parent.width
property string userId: wrapper.userId property string userId: wrapper.userId
property string previousMessageUserId: wrapper.previousMessageUserId property string previousMessageUserId: wrapper.previousMessageUserId
property string day: wrapper.day property var day: wrapper.day
property string previousMessageDay: wrapper.previousMessageDay property var previousMessageDay: wrapper.previousMessageDay
property bool previousMessageIsStateEvent: wrapper.previousMessageIsStateEvent property bool previousMessageIsStateEvent: wrapper.previousMessageIsStateEvent
property bool isStateEvent: wrapper.isStateEvent property bool isStateEvent: wrapper.isStateEvent
property bool isSender: wrapper.isSender property bool isSender: wrapper.isSender
@ -445,7 +445,7 @@ Item {
property date timestamp: wrapper.timestamp property date timestamp: wrapper.timestamp
z: 4 z: 4
active: previousMessageUserId !== undefined && previousMessageUserId !== userId || previousMessageDay !== day || previousMessageIsStateEvent !== isStateEvent active: previousMessageUserId !== userId || previousMessageDay !== day || previousMessageIsStateEvent !== isStateEvent
//asynchronous: true //asynchronous: true
sourceComponent: sectionHeader sourceComponent: sectionHeader
visible: status == Loader.Ready visible: status == Loader.Ready

2
src/timeline/TimelineModel.cpp
View file

@ -549,7 +549,7 @@ TimelineModel::data(const mtx::events::collections::TimelineEvents &event, int r
case Day: { case Day: {
QDateTime prevDate = origin_server_ts(event); QDateTime prevDate = origin_server_ts(event);
prevDate.setTime(QTime()); prevDate.setTime(QTime());
return {prevDate.toMSecsSinceEpoch()}; return QVariant(prevDate.toMSecsSinceEpoch());
} }
case Timestamp: case Timestamp:
return QVariant(origin_server_ts(event)); return QVariant(origin_server_ts(event));