iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clamp icons to standard sizes

Browse Source
This commit is contained in:
Craig Drummond
2015-10-18 15:28:15 +01:00
committed by Craig Drummond
parent 1ddd611cee
commit 36dff09cd8
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
widgets/multipagewidget.cpp
View File

@@ -53,6 +53,10 @@ public:
layout->setSpacing(2);
int size=mainText->sizeHint().height()+subText->sizeHint().height()+layout->spacing();
size+=6;
if (size<72) {
size=Icon::stdSize(size);
}
size=Utils::scaleForDpi(size);
icon->setFixedSize(size, size);
layout->addWidget(icon, 0, 0, 2, 1);
layout->addItem(new QSpacerItem(Utils::layoutSpacing(this), 2, QSizePolicy::Fixed, QSizePolicy::Fixed), 0, 1);
@@ -61,7 +65,7 @@ public:
mainText->setAlignment(Qt::AlignBottom);
subText->setAlignment(Qt::AlignTop);
icon->setAlignment(Qt::AlignCenter);
icon->setPixmap(icn.getScaledPixmap(icon->width()-2, icon->height()-2, 96));
icon->setPixmap(icn.getScaledPixmap(icon->width(), icon->height(), 96));
setAutoRaise(true);
setLayout(layout);
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);

7
widgets/titlewidget.cpp
View File

@@ -65,7 +65,10 @@ TitleWidget::TitleWidget(QWidget *p)
mainText->ensurePolished();
subText->ensurePolished();
int size=mainText->sizeHint().height()+subText->sizeHint().height()+spacing;
size=Utils::scaleForDpi(qMax(Icon::stdSize(size), 48));
if (size<72) {
size=Icon::stdSize(size);
}
size=Utils::scaleForDpi(qMax(size, 48));
image->setFixedSize(size, size);
setToolTip(i18n("Click to go back"));
spacing=qMin(4, spacing-1);
@@ -136,7 +139,7 @@ void TitleWidget::update(const Song &sng, const QIcon &icon, const QString &text
if (icon.isNull()) {
image->setVisible(false);
} else {
image->setPixmap(Icon::getScaledPixmap(icon, image->width()-2, image->height()-2, 96));
image->setPixmap(Icon::getScaledPixmap(icon, image->width(), image->height(), 96));
}
}