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

Merge branch 'devel' of git://github.com/mbruker/Cockatrice into devel

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-03-17 17:08:19 +01:00
commit 9e1ee50081
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/cardinfowidget.cpp
View file

@ -4,6 +4,7 @@
#include <QPushButton> #include <QPushButton>
#include <QStyle> #include <QStyle>
#include <QMouseEvent> #include <QMouseEvent>
#include <QDesktopWidget>
#include "cardinfowidget.h" #include "cardinfowidget.h"
#include "carditem.h" #include "carditem.h"
#include "carddatabase.h" #include "carddatabase.h"
@ -74,8 +75,9 @@ CardInfoWidget::CardInfoWidget(ResizeMode _mode, const QString &cardName, QWidge
textLabel->setMinimumHeight(100); textLabel->setMinimumHeight(100);
setFixedWidth(sizeHint().width()); setFixedWidth(sizeHint().width());
} else if (mode == ModePopUp) { } else if (mode == ModePopUp) {
setFixedWidth(350); QDesktopWidget desktopWidget;
pixmapWidth = 250; pixmapWidth = desktopWidget.screenGeometry().height() / 3 / aspectRatio;
setFixedWidth(pixmapWidth + 150);
} else } else
setFixedWidth(250); setFixedWidth(250);