feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Tweak the wizard icon text overlay

Browse Source 
Increasing the text size a bit, making the text darker and making the
margin proportional to the image size (resolution independent).

Change-Id: I029b57e2bf1c355f35161e5f8810dddea4114047
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Alessandro Portale
2017-07-24 19:29:51 +02:00
committed by Tim Jenssen
parent 8997386675
commit 5df0f97d2f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/dialogs/newdialog.cpp
View File

@@ -376,14 +376,16 @@ static QIcon iconWithText(const QIcon &icon, const QString &text)
QIcon iconWithText; QIcon iconWithText;
for (const QSize &pixmapSize : icon.availableSizes()) { for (const QSize &pixmapSize : icon.availableSizes()) {
QPixmap pixmap = icon.pixmap(pixmapSize); QPixmap pixmap = icon.pixmap(pixmapSize);
const int fontSize = pixmap.height() / 4;
const int margin = pixmap.height() / 8;
QFont font; QFont font;
font.setPixelSize(qMin(pixmap.height(), pixmap.width()) / 5); font.setPixelSize(fontSize);
font.setStretch(85);
QPainter p(&pixmap); QPainter p(&pixmap);
p.setPen(qRgb(0x6b, 0x70, 0x80));
p.setFont(font); p.setFont(font);
QTextOption textOption(Qt::AlignHCenter | Qt::AlignBottom); QTextOption textOption(Qt::AlignHCenter | Qt::AlignBottom);
textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere); textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
p.drawText(pixmap.rect().adjusted(9, 10, -9, -10), text, textOption); p.drawText(pixmap.rect().adjusted(margin, margin, -margin, -margin), text, textOption);
iconWithText.addPixmap(pixmap); iconWithText.addPixmap(pixmap);
} }
return iconWithText; return iconWithText;