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

Fixes for pasting images, especially under windows where the image mime type detection doesn't work as expected

Browse source
This commit is contained in:
Thulinma 2021-09-27 23:19:43 +02:00
parent 6941c3d3d7
commit c4b788917f
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/timeline/InputBar.cpp
View file

@ -45,10 +45,8 @@ InputBar::paste(bool fromMouse)
{ {
const QMimeData *md = nullptr; const QMimeData *md = nullptr;
if (fromMouse) { if (fromMouse && QGuiApplication::clipboard()->supportsSelection()) {
if (QGuiApplication::clipboard()->supportsSelection()) { md = QGuiApplication::clipboard()->mimeData(QClipboard::Selection);
md = QGuiApplication::clipboard()->mimeData(QClipboard::Selection);
}
} else { } else {
md = QGuiApplication::clipboard()->mimeData(QClipboard::Clipboard); md = QGuiApplication::clipboard()->mimeData(QClipboard::Clipboard);
} }
@ -69,7 +67,7 @@ InputBar::insertMimeData(const QMimeData *md)
const auto audio = formats.filter("audio/", Qt::CaseInsensitive); const auto audio = formats.filter("audio/", Qt::CaseInsensitive);
const auto video = formats.filter("video/", Qt::CaseInsensitive); const auto video = formats.filter("video/", Qt::CaseInsensitive);
if (!image.empty() && md->hasImage()) { if (md->hasImage()) {
showPreview(*md, "", image); showPreview(*md, "", image);
} else if (!audio.empty()) { } else if (!audio.empty()) {
showPreview(*md, "", audio); showPreview(*md, "", audio);
@ -653,9 +651,15 @@ InputBar::showPreview(const QMimeData &source, QString path, const QStringList &
new dialogs::PreviewUploadOverlay(ChatPage::instance()); new dialogs::PreviewUploadOverlay(ChatPage::instance());
previewDialog_->setAttribute(Qt::WA_DeleteOnClose); previewDialog_->setAttribute(Qt::WA_DeleteOnClose);
if (source.hasImage()) if (source.hasImage()) {
previewDialog_->setPreview(qvariant_cast<QImage>(source.imageData()), formats.front()); if (formats.size() && formats.front().startsWith("image/")) {
else if (!path.isEmpty()) // known format, keep as-is
previewDialog_->setPreview(qvariant_cast<QImage>(source.imageData()), formats.front());
} else {
// unknown image format, default to image/png
previewDialog_->setPreview(qvariant_cast<QImage>(source.imageData()), "image/png");
}
} else if (!path.isEmpty())
previewDialog_->setPreview(path); previewDialog_->setPreview(path);
else if (!formats.isEmpty()) { else if (!formats.isEmpty()) {
auto mime = formats.first(); auto mime = formats.first();