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

Utils: Align enum StyleHelper::UiElement with upcoming design system #2

Browse Source 
This change "PanelTitle" to "Caption". It is supposed to not change the
visual appearance.

Change-Id: I3342e6c80d8ce11b7ab1ac40b4395c265e1e07ec
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Alessandro Portale
2023-11-17 11:02:38 +01:00
parent 7f60ce0666
commit b3acdae338
8 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/utils/stylehelper.cpp
View File

@@ -952,12 +952,11 @@ QFont StyleHelper::UiFont(UiElement element)
font.setPointSizeF(font.pointSizeF() * 1.2);
font.setBold(true);
break;
case UiElementPanelTitle: {
case UiElementCaptionStrong:
font.setPointSizeF(panelTitleSize);
font.setBold(true);
break;
}
case UiElementPanelSubtitle:
case UiElementCaption:
font.setPointSizeF(panelTitleSize);
break;
}

4
src/libs/utils/stylehelper.h
View File

@@ -52,8 +52,8 @@ enum UiElement {
UiElementH2,
UiElementH3,
UiElementH4,
UiElementPanelTitle,
UiElementPanelSubtitle,
UiElementCaptionStrong,
UiElementCaption,
};
// Height of the project explorer navigation bar

6
src/plugins/coreplugin/fancyactionbar.cpp
View File

@@ -181,9 +181,9 @@ void FancyToolButton::paintEvent(QPaintEvent *event)
const bool isTitledAction = defaultAction() && defaultAction()->property("titledAction").toBool();
// draw popup texts
if (isTitledAction && !m_iconsOnly) {
const QFont normalFont = StyleHelper::UiFont(StyleHelper::UiElementPanelSubtitle);
const QFont normalFont = StyleHelper::UiFont(StyleHelper::UiElementCaption);
QRect centerRect = rect();
const QFont boldFont = StyleHelper::UiFont(StyleHelper::UiElementPanelTitle);
const QFont boldFont = StyleHelper::UiFont(StyleHelper::UiElementCaptionStrong);
const QFontMetrics fm(normalFont);
const QFontMetrics boldFm(boldFont);
const int lineHeight = boldFm.height();
@@ -284,7 +284,7 @@ QSize FancyToolButton::sizeHint() const
QSizeF buttonSize = iconSize().expandedTo(QSize(64, 38));
if (defaultAction() && defaultAction()->property("titledAction").toBool()) {
const QFont boldFont = StyleHelper::UiFont(StyleHelper::UiElementPanelTitle);
const QFont boldFont = StyleHelper::UiFont(StyleHelper::UiElementCaptionStrong);
const QFontMetrics fm(boldFont);
const qreal lineHeight = fm.height();
const int extraHeight = 10 // Spacing between top and projectName

4
src/plugins/coreplugin/fancytabwidget.cpp
View File

@@ -68,7 +68,7 @@ QSize FancyTabBar::tabSizeHint(bool minimum) const
Core::Constants::MODEBAR_ICONSONLY_BUTTON_SIZE / (minimum ? 3 : 1)};
}
const QFont boldFont = StyleHelper::UiFont(StyleHelper::UiElementPanelTitle);
const QFont boldFont = StyleHelper::UiFont(StyleHelper::UiElementCaptionStrong);
const QFontMetrics fm(boldFont);
const int spacing = 8;
const int width = 60 + spacing + 2;
@@ -283,7 +283,7 @@ static void paintIconAndText(QPainter *painter, const QRect &rect,
const QIcon &icon, const QString &text,
bool enabled, bool selected)
{
const QFont boldFont = StyleHelper::UiFont(StyleHelper::UiElementPanelTitle);
const QFont boldFont = StyleHelper::UiFont(StyleHelper::UiElementCaptionStrong);
painter->setFont(boldFont);
const bool drawIcon = rect.height() > 36;

4
src/plugins/coreplugin/progressmanager/progressbar.cpp
View File

@@ -166,7 +166,7 @@ QSize ProgressBar::sizeHint() const
int width = 50;
int height = PROGRESSBAR_HEIGHT + 5;
if (m_titleVisible) {
const QFont font = StyleHelper::UiFont(StyleHelper::UiElementPanelTitle);
const QFont font = StyleHelper::UiFont(StyleHelper::UiElementCaptionStrong);
const QFontMetrics fm(font);
width = qMax(width, fm.horizontalAdvance(m_title) + 16);
height += fm.height() + 5;
@@ -213,7 +213,7 @@ void ProgressBar::paintEvent(QPaintEvent *)
percent = 1;
QPainter p(this);
const QFont fnt = StyleHelper::UiFont(StyleHelper::UiElementPanelTitle);
const QFont fnt = StyleHelper::UiFont(StyleHelper::UiElementCaptionStrong);
const QFontMetrics fm(fnt);
const int titleHeight = m_titleVisible ? fm.height() + 5 : 4;

2
src/plugins/coreplugin/progressmanager/progressmanager.cpp
View File

@@ -661,7 +661,7 @@ void ProgressManagerPrivate::updateStatusDetailsWidget()
} else if (progress->isSubtitleVisibleInStatusBar() && !progress->subtitle().isEmpty()) {
if (!m_statusDetailsLabel) {
m_statusDetailsLabel = new QLabel(m_summaryProgressWidget);
const QFont font = StyleHelper::UiFont(StyleHelper::UiElementPanelTitle);
const QFont font = StyleHelper::UiFont(StyleHelper::UiElementCaptionStrong);
m_statusDetailsLabel->setFont(font);
}
m_statusDetailsLabel->setText(progress->subtitle());

2
src/plugins/projectexplorer/buildprogress.cpp
View File

@@ -49,7 +49,7 @@ BuildProgress::BuildProgress(TaskWindow *taskWindow, Qt::Orientation orientation
warningLayout->addWidget(m_warningIcon);
warningLayout->addWidget(m_warningLabel);
const QFont f = Utils::StyleHelper::UiFont(Utils::StyleHelper::UiElementPanelTitle);
const QFont f = Utils::StyleHelper::UiFont(Utils::StyleHelper::UiElementCaptionStrong);
m_errorLabel->setFont(f);
m_warningLabel->setFont(f);
m_errorLabel->setPalette(Utils::StyleHelper::sidebarFontPalette(m_errorLabel->palette()));

2
src/plugins/scxmleditor/common/dragshapebutton.cpp
View File

@@ -20,7 +20,7 @@ DragShapeButton::DragShapeButton(QWidget *parent)
setMinimumSize(75, 75);
setMaximumSize(75, 75);
setIconSize(QSize(45, 45));
setFont(Utils::StyleHelper::UiFont(Utils::StyleHelper::UiElementPanelSubtitle));
setFont(Utils::StyleHelper::UiFont(Utils::StyleHelper::UiElementCaption));
}
void DragShapeButton::setShapeInfo(int groupIndex, int shapeIndex)