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

Properly restore room mentions state after edit

Browse source
This commit is contained in:
Nicolas Werner 2024-06-09 15:30:30 +02:00
parent 80ab0394cd
commit 3533f104bd
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/timeline/InputBar.h
View file

@ -197,12 +197,14 @@ public slots:
textBeforeEdit = text(); textBeforeEdit = text();
mentionsBefore = mentions_; mentionsBefore = mentions_;
mentionTextsBefore = mentionTexts_; mentionTextsBefore = mentionTexts_;
containsAtRoomBefore = containsAtRoom_;
emit mentionsChanged(); emit mentionsChanged();
} }
void restoreAfterEdit() void restoreAfterEdit()
{ {
mentions_ = mentionsBefore; mentions_ = mentionsBefore;
mentionTexts_ = mentionTextsBefore; mentionTexts_ = mentionTextsBefore;
containsAtRoom_ = containsAtRoomBefore;
mentionsBefore.clear(); mentionsBefore.clear();
mentionTextsBefore.clear(); mentionTextsBefore.clear();
setText(textBeforeEdit); setText(textBeforeEdit);
@ -216,6 +218,9 @@ public slots:
mentions_ = newMentions; mentions_ = newMentions;
mentionTexts_ = newMentionTexts; mentionTexts_ = newMentionTexts;
this->containsAtRoom_ = newMentions.contains(u"@room");
emit mentionsChanged(); emit mentionsChanged();
} }
@ -331,6 +336,7 @@ private:
// store stuff during edits // store stuff during edits
QStringList mentionsBefore, mentionTextsBefore; QStringList mentionsBefore, mentionTextsBefore;
QString textBeforeEdit; QString textBeforeEdit;
bool containsAtRoomBefore = false;
using UploadHandle = std::unique_ptr<MediaUpload, DeleteLaterDeleter>; using UploadHandle = std::unique_ptr<MediaUpload, DeleteLaterDeleter>;
std::vector<UploadHandle> unconfirmedUploads; std::vector<UploadHandle> unconfirmedUploads;