Improve the event loading indicator somewhat

I added ellipses so it matches the other loading placeholder we have. I
also removed the spacing in it's layout, because there is more than
enough space inside of BusyIndicator itself that it makes the
additional spacing look odd.
This commit is contained in:
Joshua Goins
2025-08-30 15:19:40 -04:00
parent 98816aedd4
commit c7e409abe9
3 changed files with 6 additions and 5 deletions

View File

@@ -43,13 +43,13 @@ void MessageContentModelTest::missingEvent()
QCOMPARE(model1.rowCount(), 1); QCOMPARE(model1.rowCount(), 1);
QCOMPARE(model1.data(model1.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading); QCOMPARE(model1.data(model1.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading);
QCOMPARE(model1.data(model1.index(0), MessageContentModel::DisplayRole), u"Loading"_s); QCOMPARE(model1.data(model1.index(0), MessageContentModel::DisplayRole), u"Loading"_s);
auto model2 = EventMessageContentModel(room, u"$153456789:example.org"_s, true); auto model2 = EventMessageContentModel(room, u"$153456789:example.org"_s, true);
QCOMPARE(model2.rowCount(), 1); QCOMPARE(model2.rowCount(), 1);
QCOMPARE(model2.data(model2.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading); QCOMPARE(model2.data(model2.index(0), MessageContentModel::ComponentTypeRole), MessageComponentType::Loading);
QCOMPARE(model2.data(model2.index(0), MessageContentModel::DisplayRole), u"Loading reply"_s); QCOMPARE(model2.data(model2.index(0), MessageContentModel::DisplayRole), u"Loading reply"_s);
room->syncNewEvents(u"test-min-sync.json"_s); room->syncNewEvents(u"test-min-sync.json"_s);
QCOMPARE(model1.rowCount(), 2); QCOMPARE(model1.rowCount(), 2);

View File

@@ -19,7 +19,7 @@ RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.maximumWidth: Message.maxContentWidth Layout.maximumWidth: Message.maxContentWidth
spacing: Kirigami.Units.smallSpacing spacing: 0
QQC2.BusyIndicator {} QQC2.BusyIndicator {}
Kirigami.Heading { Kirigami.Heading {
@@ -27,7 +27,7 @@ RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
level: 2 level: 2
text: root.display.length > 0 ? root.display : i18n("Loading") text: root.display.length > 0 ? root.display : i18nc("@info Loading this message", "Loading…")
} }
} }

View File

@@ -256,7 +256,8 @@ void EventMessageContentModel::resetModel()
const auto event = m_room->getEvent(m_eventId); const auto event = m_room->getEvent(m_eventId);
if (event.first == nullptr) { if (event.first == nullptr) {
m_components += MessageComponent{MessageComponentType::Loading, m_isReply ? i18n("Loading reply") : i18n("Loading"), {}}; m_components +=
MessageComponent{MessageComponentType::Loading, m_isReply ? i18nc("@info", "Loading reply…") : i18nc("@info Loading this message", "Loading…"), {}};
endResetModel(); endResetModel();
return; return;
} }