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

Dont use bold font for main text - use ligher text for sub

Browse Source
This commit is contained in:
Craig Drummond
2016-06-17 22:21:43 +01:00
parent 16796f1041
commit 91adf4fba7
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
widgets/multipagewidget.cpp
View File

@@ -46,10 +46,7 @@ public:
icon=new QLabel(this);
mainText=new SqueezedTextLabel(this);
subText=new SqueezedTextLabel(this);
QFont f=mainText->font();
subText->setFont(Utils::smallFont(f));
f.setBold(true);
mainText->setFont(f);
subText->setFont(Utils::smallFont(mainText->font()));
layout->setSpacing(2);
int textSize=mainText->sizeHint().height()+subText->sizeHint().height()+layout->spacing();
textSize+=6;
@@ -57,6 +54,12 @@ public:
if (size<72) {
size=Utils::scaleForDpi(32);
}
QPalette pal=mainText->palette();
QColor col(mainText->palette().windowText().color());
col.setAlphaF(0.5);
pal.setColor(QPalette::ButtonText, col);
subText->setPalette(pal);
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);

7
widgets/titlewidget.cpp
View File

@@ -54,14 +54,17 @@ TitleWidget::TitleWidget(QWidget *p)
QLabel *chevron=new QLabel(QChar(Qt::RightToLeft==layoutDirection() ? 0x203A : 0x2039), this);
QFont f=mainText->font();
subText->setFont(Utils::smallFont(f));
f.setBold(true);
mainText->setFont(f);
if (f.pixelSize()>0) {
f.setPixelSize(f.pixelSize()*2);
} else {
f.setPointSizeF(f.pointSizeF()*2);
}
f.setBold(false);
QPalette pal=mainText->palette();
QColor col(mainText->palette().windowText().color());
col.setAlphaF(0.5);
pal.setColor(QPalette::WindowText, col);
subText->setPalette(pal);
chevron->setFont(f);
int spacing=Utils::layoutSpacing(this);
mainText->ensurePolished();