Overhaul room list sorting
This commit is contained in:
@@ -2,12 +2,19 @@ import QtQuick 2.7
|
||||
import "../base" as Base
|
||||
|
||||
Base.HLabel {
|
||||
property bool isToday: {
|
||||
const today = new Date()
|
||||
return dateTime.getDate() == today.getDate() &&
|
||||
dateTime.getMonth() == today.getMonth() &&
|
||||
dateTime.getFullYear() == today.getFullYear()
|
||||
}
|
||||
|
||||
width: messageDelegate.width
|
||||
topPadding: messageDelegate.isFirstMessage ?
|
||||
0 : messageDelegate.standardSpacing
|
||||
bottomPadding: messageDelegate.standardSpacing
|
||||
|
||||
text: dateTime.toLocaleDateString()
|
||||
text: dateTime.toLocaleDateString() + (isToday ? qsTr(" (Today)") : "")
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
font.pixelSize: normalSize * 1.1
|
||||
color: "darkolivegreen"
|
||||
|
@@ -46,7 +46,7 @@ Column {
|
||||
readonly property bool dayBreak:
|
||||
isFirstEvent ||
|
||||
previousItem &&
|
||||
dateTime.getDay() != previousItem.dateTime.getDay()
|
||||
dateTime.getDate() != previousItem.dateTime.getDate()
|
||||
|
||||
readonly property bool talkBreak:
|
||||
previousItem &&
|
||||
|
@@ -37,7 +37,9 @@ MouseArea {
|
||||
}
|
||||
Base.HLabel {
|
||||
function getText() {
|
||||
return SidePaneJS.getLastRoomEventText(roomId)
|
||||
return SidePaneJS.getLastRoomEventText(
|
||||
roomId, roomList.forUserId
|
||||
)
|
||||
}
|
||||
|
||||
Connections {
|
||||
|
@@ -1,13 +1,13 @@
|
||||
.import "../chat/utils.js" as ChatJS
|
||||
|
||||
|
||||
function getLastRoomEventText(roomId) {
|
||||
function getLastRoomEventText(roomId, accountId) {
|
||||
var eventsModel = Backend.models.roomEvents.get(roomId)
|
||||
|
||||
for (var i = 0; i < eventsModel.count; i++) {
|
||||
var ev = eventsModel.get(i)
|
||||
|
||||
if (ev.type !== "RoomMemberEvent") {
|
||||
if (! Backend.EventIsOurProfileChanged(ev, accountId)) {
|
||||
var found = true
|
||||
break
|
||||
}
|
||||
|
Reference in New Issue
Block a user