jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-16 20:17:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Split pictuloader out of carddatabase

Browse source
This commit is contained in:
Fabio Bas 2015-09-23 21:55:41 +02:00
parent aebc18fc3f
commit 4d7795ca3a
19 changed files with 648 additions and 686 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/src/cardinfopicture.cpp
View file

@ -6,6 +6,7 @@
#include "carditem.h"
#include "carddatabase.h"
#include "pictureloader.h"
#include "main.h"
CardInfoPicture::CardInfoPicture(QWidget *parent)
@ -40,13 +41,13 @@ void CardInfoPicture::updatePixmap()
void CardInfoPicture::loadPixmap()
{
if(info)
info->getPixmap(size(), resizedPixmap);
PictureLoader::getPixmap(resizedPixmap, info, size());
else
resizedPixmap = QPixmap();
if (resizedPixmap.isNull())
db->getCard()->getPixmap(size(), resizedPixmap);
PictureLoader::getPixmap(resizedPixmap, db->getCard(), size());
}
void CardInfoPicture::paintEvent(QPaintEvent *)