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

Cleanup jdenticon code in the same way as blurhashes

Browse source
This commit is contained in:
Nicolas Werner 2021-12-21 15:06:34 +01:00
parent 04cccb8283
commit 8edc46dc16
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
3 changed files with 112 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/BlurhashProvider.h
View file

@ -50,7 +50,7 @@ public:
void handleDone(QImage image)
{
m_image = image;
m_image = std::move(image);
emit finished();
}
void handleError(QString error)

137
src/JdenticonProvider.cpp
View file

@ -19,65 +19,6 @@
#include "Utils.h"
#include "jdenticoninterface.h"
static QPixmap
clipRadius(QPixmap img, double radius)
{
QPixmap out(img.size());
out.fill(Qt::transparent);
QPainter painter(&out);
painter.setRenderHint(QPainter::Antialiasing, true);
painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
QPainterPath ppath;
ppath.addRoundedRect(img.rect(), radius, radius, Qt::SizeMode::RelativeSize);
painter.setClipPath(ppath);
painter.drawPixmap(img.rect(), img);
return out;
}
JdenticonResponse::JdenticonResponse(const QString &key,
bool crop,
double radius,
const QSize &requestedSize)
: m_key(key)
, m_crop{crop}
, m_radius{radius}
, m_requestedSize(requestedSize.isValid() ? requestedSize : QSize(100, 100))
, m_pixmap{m_requestedSize}
, jdenticonInterface_{Jdenticon::getJdenticonInterface()}
{
setAutoDelete(false);
}
void
JdenticonResponse::run()
{
m_pixmap.fill(Qt::transparent);
QPainter painter;
painter.begin(&m_pixmap);
painter.setRenderHint(QPainter::Antialiasing, true);
painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
try {
QSvgRenderer renderer{
jdenticonInterface_->generate(m_key, m_requestedSize.width()).toUtf8()};
renderer.render(&painter);
} catch (std::exception &e) {
nhlog::ui()->error(
"caught {} in jdenticonprovider, key '{}'", e.what(), m_key.toStdString());
}
painter.end();
m_pixmap = clipRadius(m_pixmap, m_radius);
emit finished();
}
namespace Jdenticon {
JdenticonInterface *
getJdenticonInterface()
@ -106,3 +47,81 @@ getJdenticonInterface()
return interface;
}
}
static QPixmap
clipRadius(QPixmap img, double radius)
{
QPixmap out(img.size());
out.fill(Qt::transparent);
QPainter painter(&out);
painter.setRenderHint(QPainter::Antialiasing, true);
painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
QPainterPath ppath;
ppath.addRoundedRect(img.rect(), radius, radius, Qt::SizeMode::RelativeSize);
painter.setClipPath(ppath);
painter.drawPixmap(img.rect(), img);
return out;
}
JdenticonResponse::JdenticonResponse(const QString &key,
bool crop,
double radius,
const QSize &requestedSize,
QThreadPool *pool)
{
auto runnable = new JdenticonRunnable(key, crop, radius, requestedSize);
connect(runnable, &JdenticonRunnable::done, this, &JdenticonResponse::handleDone);
pool->start(runnable);
}
JdenticonRunnable::JdenticonRunnable(const QString &key,
bool crop,
double radius,
const QSize &requestedSize)
: m_key(key)
, m_crop{crop}
, m_radius{radius}
, m_requestedSize(requestedSize.isValid() ? requestedSize : QSize(100, 100))
{}
void
JdenticonRunnable::run()
{
QPixmap pixmap(m_requestedSize);
pixmap.fill(Qt::transparent);
auto jdenticon = Jdenticon::getJdenticonInterface();
if (!jdenticon) {
emit done(pixmap.toImage());
return;
}
QPainter painter;
painter.begin(&pixmap);
painter.setRenderHint(QPainter::Antialiasing, true);
painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
try {
QSvgRenderer renderer{jdenticon->generate(m_key, m_requestedSize.width()).toUtf8()};
renderer.render(&painter);
} catch (std::exception &e) {
nhlog::ui()->error(
"caught {} in jdenticonprovider, key '{}'", e.what(), m_key.toStdString());
}
painter.end();
pixmap = clipRadius(pixmap, m_radius);
emit done(pixmap.toImage());
}
bool
JdenticonProvider::isAvailable()
{
return Jdenticon::getJdenticonInterface() != nullptr;
}

52
src/JdenticonProvider.h
View file

@ -13,31 +13,47 @@
#include "jdenticoninterface.h"
namespace Jdenticon {
JdenticonInterface *
getJdenticonInterface();
}
class JdenticonResponse
: public QQuickImageResponse
class JdenticonRunnable
: public QObject
, public QRunnable
{
Q_OBJECT
public:
JdenticonResponse(const QString &key, bool crop, double radius, const QSize &requestedSize);
QQuickTextureFactory *textureFactory() const override
{
return QQuickTextureFactory::textureFactoryForImage(m_pixmap.toImage());
}
JdenticonRunnable(const QString &key, bool crop, double radius, const QSize &requestedSize);
void run() override;
signals:
void done(QImage img);
private:
QString m_key;
bool m_crop;
double m_radius;
QSize m_requestedSize;
QPixmap m_pixmap;
JdenticonInterface *jdenticonInterface_ = nullptr;
};
class JdenticonResponse : public QQuickImageResponse
{
public:
JdenticonResponse(const QString &key,
bool crop,
double radius,
const QSize &requestedSize,
QThreadPool *pool);
QQuickTextureFactory *textureFactory() const override
{
return QQuickTextureFactory::textureFactoryForImage(m_pixmap);
}
void handleDone(QImage img)
{
m_pixmap = std::move(img);
emit finished();
}
QImage m_pixmap;
};
class JdenticonProvider
@ -47,7 +63,7 @@ class JdenticonProvider
Q_OBJECT
public:
static bool isAvailable() { return Jdenticon::getJdenticonInterface() != nullptr; }
static bool isAvailable();
public slots:
QQuickImageResponse *
@ -70,9 +86,7 @@ public slots:
}
}
JdenticonResponse *response = new JdenticonResponse(id_, crop, radius, requestedSize);
pool.start(response);
return response;
return new JdenticonResponse(id_, crop, radius, requestedSize, &pool);
}
private: