status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(QClipboardProxy): return imageBase64 as a QString 

for better interop with NIM/status-go
This commit is contained in:
Lukáš Tinkl 2022-11-25 12:23:56 +01:00 committed by Michał
parent be3baf4bca
commit f8767e0c5d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/DOtherSide/lib/include/DOtherSide/Status/QClipboardProxy.h vendored
View File

@ -20,7 +20,7 @@ class QClipboardProxy : public QObject
Q_PROPERTY(bool hasImage READ hasImage NOTIFY contentChanged) Q_PROPERTY(bool hasImage READ hasImage NOTIFY contentChanged)
Q_PROPERTY(QImage image READ image NOTIFY contentChanged) Q_PROPERTY(QImage image READ image NOTIFY contentChanged)
Q_PROPERTY(QByteArray imageBase64 READ imageBase64 NOTIFY contentChanged) Q_PROPERTY(QString imageBase64 READ imageBase64 NOTIFY contentChanged)
Q_PROPERTY(bool hasUrls READ hasUrls NOTIFY contentChanged) Q_PROPERTY(bool hasUrls READ hasUrls NOTIFY contentChanged)
Q_PROPERTY(QList<QUrl> urls READ urls NOTIFY contentChanged) Q_PROPERTY(QList<QUrl> urls READ urls NOTIFY contentChanged)
@ -35,7 +35,7 @@ class QClipboardProxy : public QObject
bool hasImage() const; bool hasImage() const;
QImage image() const; QImage image() const;
QByteArray imageBase64() const; QString imageBase64() const;
bool hasUrls() const; bool hasUrls() const;
QList<QUrl> urls() const; QList<QUrl> urls() const;

4
vendor/DOtherSide/lib/src/Status/QClipboardProxy.cpp vendored
View File

@ -46,7 +46,7 @@ QImage QClipboardProxy::image() const
return m_clipboard->image(); return m_clipboard->image();
} }
QByteArray QClipboardProxy::imageBase64() const QString QClipboardProxy::imageBase64() const
{ {
if (!hasImage()) if (!hasImage())
return {}; return {};
@ -55,7 +55,7 @@ QByteArray QClipboardProxy::imageBase64() const
QByteArray byteArray; QByteArray byteArray;
QBuffer buffer(&byteArray); QBuffer buffer(&byteArray);
img.save(&buffer, "PNG"); // writes the image in PNG format inside the buffer img.save(&buffer, "PNG"); // writes the image in PNG format inside the buffer
return QByteArrayLiteral("data:image/png;base64,") + byteArray.toBase64().constData(); return QStringLiteral("data:image/png;base64,") + byteArray.toBase64();
} }
bool QClipboardProxy::hasUrls() const bool QClipboardProxy::hasUrls() const