void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't insert "data:image.." after image paste cancel.

Browse source
This commit is contained in:
John Preston 2024-07-04 08:57:41 +04:00
parent b377c02ad3
commit b648548001
4 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/SourceFiles/history/history_widget.cpp
View file

@ -5668,7 +5668,7 @@ bool HistoryWidget::confirmSendingFiles(
cursor.setPosition(position, QTextCursor::KeepAnchor); cursor.setPosition(position, QTextCursor::KeepAnchor);
} }
_field->setTextCursor(cursor); _field->setTextCursor(cursor);
if (!insertTextOnCancel.isEmpty()) { if (Ui::InsertTextOnImageCancel(insertTextOnCancel)) {
_field->textCursor().insertText(insertTextOnCancel); _field->textCursor().insertText(insertTextOnCancel);
} }
})); }));

2
Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
View file

@ -3415,7 +3415,7 @@ Fn<void()> ComposeControls::restoreTextCallback(
cursor.setPosition(position, QTextCursor::KeepAnchor); cursor.setPosition(position, QTextCursor::KeepAnchor);
} }
_field->setTextCursor(cursor); _field->setTextCursor(cursor);
if (!insertTextOnCancel.isEmpty()) { if (Ui::InsertTextOnImageCancel(insertTextOnCancel)) {
_field->textCursor().insertText(insertTextOnCancel); _field->textCursor().insertText(insertTextOnCancel);
} }
}); });

4
Telegram/SourceFiles/ui/chat/attach/attach_prepare.cpp
View file

@ -82,6 +82,10 @@ bool CanBeInAlbumType(PreparedFile::Type type, AlbumType album) {
Unexpected("AlbumType in CanBeInAlbumType."); Unexpected("AlbumType in CanBeInAlbumType.");
} }
bool InsertTextOnImageCancel(const QString &text) {
return !text.isEmpty() && !text.startsWith(u"data:image"_q);
}
PreparedList PreparedList::Reordered( PreparedList PreparedList::Reordered(
PreparedList &&list, PreparedList &&list,
std::vector<int> order) { std::vector<int> order) {

1
Telegram/SourceFiles/ui/chat/attach/attach_prepare.h
View file

@ -88,6 +88,7 @@ struct PreparedFile {
}; };
[[nodiscard]] bool CanBeInAlbumType(PreparedFile::Type type, AlbumType album); [[nodiscard]] bool CanBeInAlbumType(PreparedFile::Type type, AlbumType album);
[[nodiscard]] bool InsertTextOnImageCancel(const QString &text);
struct PreparedList { struct PreparedList {
enum class Error { enum class Error {