Skip to content
GitLab
Commit 9e1ee500 authored by Max-Wilhelm Bruker's avatar Max-Wilhelm Bruker
Browse files

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

parents 22592048 76c7d963
Hide whitespace changes
Inline Side-by-side
cockatrice/src/cardinfowidget.cpp
View file @ 9e1ee500
...@@ -4,6 +4,7 @@ ...@@ -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 ...@@ -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);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment