summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2021-03-20 23:15:28 +0000
committerGitHub <noreply@github.com>2021-03-20 23:15:28 +0000
commite46ddbbb459637f40053b2bdcefa8eb3a1062795 (patch)
treeacbb432f9df88864ce11d8b2631efd089cd342dd /src
parentReserve memory for rooms in completer (diff)
parentPressing escape hides PreviewUploadOverlay (diff)
downloadnheko-e46ddbbb459637f40053b2bdcefa8eb3a1062795.tar.xz
Merge pull request #532 from salahmak/esc-cancel-upload
Pressing escape hides PreviewUploadOverlay
Diffstat (limited to 'src')
-rw-r--r--src/dialogs/PreviewUploadOverlay.cpp11
-rw-r--r--src/dialogs/PreviewUploadOverlay.h1
2 files changed, 12 insertions, 0 deletions
diff --git a/src/dialogs/PreviewUploadOverlay.cpp b/src/dialogs/PreviewUploadOverlay.cpp

index b2bef136..66fa1b37 100644 --- a/src/dialogs/PreviewUploadOverlay.cpp +++ b/src/dialogs/PreviewUploadOverlay.cpp
@@ -203,3 +203,14 @@ PreviewUploadOverlay::setPreview(const QString &path) setLabels(split[1], mime.name(), data_.size()); init(); } + +void +PreviewUploadOverlay::keyPressEvent(QKeyEvent *event) +{ + if (event->matches(QKeySequence::Cancel)) { + emit aborted(); + close(); + } else { + QWidget::keyPressEvent(event); + } +} \ No newline at end of file diff --git a/src/dialogs/PreviewUploadOverlay.h b/src/dialogs/PreviewUploadOverlay.h
index 7493f67c..d23ea0ae 100644 --- a/src/dialogs/PreviewUploadOverlay.h +++ b/src/dialogs/PreviewUploadOverlay.h
@@ -25,6 +25,7 @@ public: void setPreview(const QImage &src, const QString &mime); void setPreview(const QByteArray data, const QString &mime); void setPreview(const QString &path); + void keyPressEvent(QKeyEvent *event); signals: void confirmUpload(const QByteArray data, const QString &media, const QString &filename);