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

Support pasting image/svg+xml format straight from supporting applications

Browse source
This commit is contained in:
Thulinma 2021-09-28 01:42:35 +02:00
parent c4b788917f
commit 94441e68fd
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/dialogs/PreviewUploadOverlay.cpp
View file

@ -158,6 +158,8 @@ PreviewUploadOverlay::setPreview(const QImage &src, const QString &mime)
void void
PreviewUploadOverlay::setPreview(const QByteArray data, const QString &mime) PreviewUploadOverlay::setPreview(const QByteArray data, const QString &mime)
{ {
nhlog::ui()->info("Pasting {} bytes of data, mimetype {}", data.size(), mime.toStdString());
auto const &split = mime.split('/'); auto const &split = mime.split('/');
auto const &type = split[1]; auto const &type = split[1];
@ -166,6 +168,11 @@ PreviewUploadOverlay::setPreview(const QByteArray data, const QString &mime)
filePath_ = "clipboard." + type; filePath_ = "clipboard." + type;
isImage_ = false; isImage_ = false;
if (mime == "image/svg+xml") {
isImage_ = true;
image_.loadFromData(data_, mediaType_.toStdString().c_str());
}
setLabels(type, mime, data_.size()); setLabels(type, mime, data_.size());
init(); init();
} }

15
src/timeline/InputBar.cpp
View file

@ -68,7 +68,11 @@ InputBar::insertMimeData(const QMimeData *md)
const auto video = formats.filter("video/", Qt::CaseInsensitive); const auto video = formats.filter("video/", Qt::CaseInsensitive);
if (md->hasImage()) { if (md->hasImage()) {
showPreview(*md, "", image); if (formats.contains("image/svg+xml", Qt::CaseInsensitive)) {
showPreview(*md, "", QStringList("image/svg+xml"));
} else {
showPreview(*md, "", image);
}
} else if (!audio.empty()) { } else if (!audio.empty()) {
showPreview(*md, "", audio); showPreview(*md, "", audio);
} else if (!video.empty()) { } else if (!video.empty()) {
@ -651,7 +655,8 @@ 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()) { // Force SVG to _not_ be handled as an image, but as raw data
if (source.hasImage() && (!formats.size() || formats.front() != "image/svg+xml")) {
if (formats.size() && formats.front().startsWith("image/")) { if (formats.size() && formats.front().startsWith("image/")) {
// known format, keep as-is // known format, keep as-is
previewDialog_->setPreview(qvariant_cast<QImage>(source.imageData()), formats.front()); previewDialog_->setPreview(qvariant_cast<QImage>(source.imageData()), formats.front());
@ -679,6 +684,12 @@ InputBar::showPreview(const QMimeData &source, QString path, const QStringList &
&dialogs::PreviewUploadOverlay::confirmUpload, &dialogs::PreviewUploadOverlay::confirmUpload,
this, this,
[this](const QByteArray data, const QString &mime, const QString &fn) { [this](const QByteArray data, const QString &mime, const QString &fn) {
if (!data.size()) {
nhlog::ui()->warn("Attempted to upload zero-byte file?! Mimetype {}, filename {}",
mime.toStdString(),
fn.toStdString());
return;
}
setUploading(true); setUploading(true);
setText(""); setText("");