aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1471 from ctrlaltca/deckeditor_theme_cardback

Browse source 
get cardback image from theme
This commit is contained in:
woogerboy21 2015-09-06 08:25:48 -04:00
commit dd4900b038
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cockatrice/src/carddatabase.cpp
View file

@ -7,7 +7,6 @@
#include <QDirIterator> #include <QDirIterator>
#include <QFile> #include <QFile>
#include <QTextStream> #include <QTextStream>
#include <QSvgRenderer>
#include <QPainter> #include <QPainter>
#include <QUrl> #include <QUrl>
#include <QSet> #include <QSet>
@ -657,11 +656,7 @@ void CardInfo::getPixmap(QSize size, QPixmap &pixmap)
loadPixmap(bigPixmap); loadPixmap(bigPixmap);
if (bigPixmap.isNull()) { if (bigPixmap.isNull()) {
if (getName().isEmpty()) { if (getName().isEmpty()) {
QSvgRenderer svg(QString("theme:back.svg")); pixmap = themeManager->getCardBackPixmap();
bigPixmap = QPixmap(svg.defaultSize());
bigPixmap.fill(Qt::transparent);
QPainter painter(&bigPixmap);
svg.render(&painter);
} else { } else {
pixmap = QPixmap(); // null pixmap = QPixmap(); // null
return; return;