Skip to content

Use QImageReader instead of QSvgRender for XdgIconLoader #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BLumia wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use QImageReader instead of QSvgRender for XdgIconLoader #291

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions src/xdgiconloader/xdgiconloader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
#include <QImageReader>
#include <QXmlStreamReader>
#include <QFileSystemWatcher>
#include <QSvgRenderer>
#include <QBuffer>

#include <private/qhexstring_p.h>

Expand Down Expand Up @@ -829,12 +829,12 @@ QPixmap ScalableEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State
pm = QPixmap(icnSize, icnSize);
pm.fill(Qt::transparent);

QSvgRenderer renderer;
if (renderer.load(filename))
{
QImageReader imageReader(filename);
if (imageReader.canRead()) {
imageReader.setScaledSize(QSize(icnSize, icnSize));
QPainter p;
p.begin(&pm);
renderer.render(&p, QRect(0, 0, icnSize, icnSize));
p.drawImage(0, 0, imageReader.read());
p.end();
}

Expand Down Expand Up @@ -928,11 +928,14 @@ QPixmap ScalableFollowsColorEntry::pixmap(const QSize &size, QIcon::Mode mode, Q

if (!svgBuffer.isEmpty())
{
QSvgRenderer renderer;
renderer.load(svgBuffer);
QBuffer buffer;
buffer.setData(svgBuffer);
buffer.open(QIODevice::ReadOnly);
QImageReader imageReader(&buffer);
imageReader.setScaledSize(QSize(icnSize, icnSize));
QPainter p;
p.begin(&pm);
renderer.render(&p, QRect(0, 0, icnSize, icnSize));
p.drawImage(0, 0, imageReader.read());
p.end();
}
}
Expand Down