ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make clearing reply not remove your text

Browse Source
This commit is contained in:
Jan Bidler
2022-08-25 13:52:10 +02:00
committed by Carl Schwan
parent 57b1bb659c
commit 3c98a8fac4
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
imports/NeoChat/Component/ChatBox/ReplyPane.qml
View File

@@ -106,7 +106,7 @@ Loader {
text: i18n("Cancel") text: i18n("Cancel")
display: AbstractButton.IconOnly display: AbstractButton.IconOnly
onClicked: { onClicked: {
ChatBoxHelper.clearEditReply(); ChatBoxHelper.clear();
root.replyCancelled(); root.replyCancelled();
} }
ToolTip.text: text ToolTip.text: text

3
src/chatboxhelper.cpp
View File

@@ -131,8 +131,8 @@ void ChatBoxHelper::clear()
setEditContent(QString()); setEditContent(QString());
setReplyEventId(QString()); setReplyEventId(QString());
setReplyEventContent(QString()); setReplyEventContent(QString());
setAttachmentPath(QString());
setReplyUser(QVariant()); setReplyUser(QVariant());
setAttachmentPath(QString());
} }
void ChatBoxHelper::edit(const QString &message, const QString &formattedBody, const QString &eventId) void ChatBoxHelper::edit(const QString &message, const QString &formattedBody, const QString &eventId)
@@ -149,6 +149,7 @@ void ChatBoxHelper::clearEditReply()
setReplyEventId(QString()); setReplyEventId(QString());
setReplyEventContent(QString()); setReplyEventContent(QString());
setReplyUser(QVariant()); setReplyUser(QVariant());
setAttachmentPath(QString());
Q_EMIT shouldClearText(); Q_EMIT shouldClearText();
} }