tan
/
Spectral
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reenable local echo. 

Move fast and break things.
This commit is contained in:
Black Hat 2018-11-05 07:39:29 +08:00
parent b7dc378c65
commit 1ac443253a
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
imports/Spectral/Component/Timeline/MessageDelegate.qml
View File

@ -8,8 +8,6 @@ import Spectral.Setting 0.1
import Spectral.Component 2.0 import Spectral.Component 2.0
import "qrc:/js/util.js" as Util
RowLayout { RowLayout {
readonly property bool avatarVisible: !sentByMe && (aboveAuthor !== author || aboveSection !== section || aboveEventType === "state" || aboveEventType === "emote" || aboveEventType === "other") readonly property bool avatarVisible: !sentByMe && (aboveAuthor !== author || aboveSection !== section || aboveEventType === "state" || aboveEventType === "emote" || aboveEventType === "other")
readonly property bool highlighted: !(sentByMe || eventType === "notice" ) readonly property bool highlighted: !(sentByMe || eventType === "notice" )

2
imports/Spectral/Panel/RoomPanelForm.ui.qml
View File

@ -139,7 +139,7 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
visible: readMarker === true && index !== 0 visible: readMarker === true
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true

2
include/libqmatrixclient

@ -1 +1 @@
Subproject commit a81383549df4db8a487a847dca41900f3ab38c27 Subproject commit be7d25ed22abd07a254bfb8ff6c30de4fcc79e6a

4
src/messageeventmodel.cpp
View File

@ -306,10 +306,10 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const {
if (role == HighlightRole) return m_currentRoom->isEventHighlighted(&evt); if (role == HighlightRole) return m_currentRoom->isEventHighlighted(&evt);
if (role == ReadMarkerRole) return evt.id() == lastReadEventId; if (role == ReadMarkerRole) return evt.id() == lastReadEventId && row > timelineBaseIndex();
if (role == SpecialMarksRole) { if (role == SpecialMarksRole) {
if (isPending) return EventStatus::Hidden; if (isPending) return pendingIt->deliveryStatus();
if (is<RedactionEvent>(evt)) return EventStatus::Hidden; if (is<RedactionEvent>(evt)) return EventStatus::Hidden;
if (evt.isRedacted()) return EventStatus::Redacted; if (evt.isRedacted()) return EventStatus::Redacted;