Indicate messages that are not sent yet

src/models/messageeventmodel.cpp

@@ -68,6 +68,7 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
     roles[IsAvatarChangeRole] = "isAvatarChange";
     roles[IsRedactedRole] = "isRedacted";
     roles[GenericDisplayRole] = "genericDisplay";
+    roles[IsPendingRole] = "isPending";
     return roles;
 }
 
@@ -176,6 +177,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
         });
         connect(m_currentRoom, &Room::pendingEventAdded, this, &MessageEventModel::endInsertRows);
         connect(m_currentRoom, &Room::pendingEventAboutToMerge, this, [this](RoomEvent *, int i) {
+            Q_EMIT dataChanged(index(i, 0), index(i, 0), {IsPendingRole});
             if (i == 0) {
                 return; // No need to move anything, just refresh
             }
@@ -908,6 +910,10 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         return evt.isRedacted();
     }
 
+    if (role == IsPendingRole) {
+        return row < m_currentRoom->pendingEvents().size();
+    }
+
     return {};
 }
 

src/models/messageeventmodel.h

@@ -73,6 +73,7 @@ public:
         IsNameChangeRole,
         IsAvatarChangeRole,
         IsRedactedRole,
+        IsPendingRole,
         LastRole, // Keep this last
     };
     Q_ENUM(EventRoles)

src/qml/Component/Timeline/TimelineContainer.qml

@@ -197,7 +197,15 @@ ColumnLayout {
                 }
             ]
 
-            contentItem: ColumnLayout {
+            contentItem: RowLayout {
+                Kirigami.Icon {
+                    source: "content-loading-symbolic"
+                    width: height
+                    Layout.preferredWidth: Kirigami.Units.iconSizes.small
+                    Layout.preferredHeight: Kirigami.Units.iconSizes.small
+                    visible: model.isPending && Config.showLocalMessagesOnRight
+                }
+                ColumnLayout {
                     id: column
                     spacing: Kirigami.Units.smallSpacing
                     RowLayout {
@@ -266,6 +274,15 @@ ColumnLayout {
                         }
                     }
                 }
+                Kirigami.Icon {
+                    source: "content-loading-symbolic"
+                    width: height
+                    Layout.preferredWidth: Kirigami.Units.iconSizes.small
+                    Layout.preferredHeight: Kirigami.Units.iconSizes.small
+                    visible: model.isPending && !Config.showLocalMessagesOnRight
+                }
+            }
+
 
             background: Item {
                 Kirigami.ShadowedRectangle {