summary refs log tree commit diff
path: root/src/timeline/InputBar.h
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2022-06-15 14:31:46 +0000
committerGitHub <noreply@github.com>2022-06-15 14:31:46 +0000
commit835fcf632515cd821d2fe3d38170b6863a474c04 (patch)
treeaf52fd85eb68c3080dc62cb436785991b47956c6 /src/timeline/InputBar.h
parentFix failed uploads not removing uploads (diff)
parentSubtle corrections to paste behaviors (diff)
downloadnheko-835fcf632515cd821d2fe3d38170b6863a474c04.tar.xz
Merge pull request #1095 from syldrathecat/subtle-paste-fixes
Subtle corrections to paste behaviors
Diffstat (limited to 'src/timeline/InputBar.h')
-rw-r--r--src/timeline/InputBar.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/timeline/InputBar.h b/src/timeline/InputBar.h

index 28a4bcf6..816d4e37 100644 --- a/src/timeline/InputBar.h +++ b/src/timeline/InputBar.h
@@ -190,8 +190,8 @@ public slots: [[nodiscard]] bool containsAtRoom() const { return containsAtRoom_; } void send(); - void paste(bool fromMouse); - void insertMimeData(const QMimeData *data); + bool tryPasteAttachment(bool fromMouse); + bool insertMimeData(const QMimeData *data); void updateState(int selectionStart, int selectionEnd, int cursorPosition, const QString &text); void openFileSelection(); [[nodiscard]] bool uploading() const { return uploading_; } @@ -212,7 +212,6 @@ private slots: void removeRunUpload(MediaUpload *upload); signals: - void insertText(QString text); void textChanged(QString newText); void uploadingChanged(bool value); void containsAtRoomChanged();