Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
dd4900b0
Commit
dd4900b0
authored
Sep 06, 2015
by
woogerboy21
Browse files
Merge pull request #1471 from ctrlaltca/deckeditor_theme_cardback
get cardback image from theme
parents
15e8121c
e50d0c6d
Changes
1
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/carddatabase.cpp
View file @
dd4900b0
...
...
@@ -7,7 +7,6 @@
#include
<QDirIterator>
#include
<QFile>
#include
<QTextStream>
#include
<QSvgRenderer>
#include
<QPainter>
#include
<QUrl>
#include
<QSet>
...
...
@@ -657,11 +656,7 @@ void CardInfo::getPixmap(QSize size, QPixmap &pixmap)
loadPixmap
(
bigPixmap
);
if
(
bigPixmap
.
isNull
())
{
if
(
getName
().
isEmpty
())
{
QSvgRenderer
svg
(
QString
(
"theme:back.svg"
));
bigPixmap
=
QPixmap
(
svg
.
defaultSize
());
bigPixmap
.
fill
(
Qt
::
transparent
);
QPainter
painter
(
&
bigPixmap
);
svg
.
render
(
&
painter
);
pixmap
=
themeManager
->
getCardBackPixmap
();
}
else
{
pixmap
=
QPixmap
();
// null
return
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment