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

Ensure consistent size of facnyactionbar button

Browse Source 
Otherwise the button can jump on switching projects.

Change-Id: I2b6d0a5afe5fc54933fe31d381a312cce896361e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Daniel Teske
2012-01-26 13:06:30 +01:00
committed by Eike Ziller
parent d3f889df7d
commit 8591b89807
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,9 +200,7 @@ void FancyToolButton::paintEvent(QPaintEvent *event)
if (!projectName.isNull()) if (!projectName.isNull())
centerRect.adjust(0, lineHeight + 4, 0, 0); centerRect.adjust(0, lineHeight + 4, 0, 0);
const QString buildConfiguration = defaultAction()->property("subtitle").toString(); centerRect.adjust(0, 0, 0, -lineHeight*2 - 4);
if (!buildConfiguration.isNull())
centerRect.adjust(0, 0, 0, -lineHeight*2 - 4);
iconRect.moveCenter(centerRect.center()); iconRect.moveCenter(centerRect.center());
Utils::StyleHelper::drawIconWithShadow(icon(), iconRect, &painter, isEnabled() ? QIcon::Normal : QIcon::Disabled); Utils::StyleHelper::drawIconWithShadow(icon(), iconRect, &painter, isEnabled() ? QIcon::Normal : QIcon::Disabled);
@@ -237,6 +235,7 @@ void FancyToolButton::paintEvent(QPaintEvent *event)
buildConfigRect[1] = QRectF(0, textOffset.y() + 5 + lineHeight, rect().width(), lineHeight); buildConfigRect[1] = QRectF(0, textOffset.y() + 5 + lineHeight, rect().width(), lineHeight);
painter.setFont(boldFont); painter.setFont(boldFont);
QVector<QString> splitBuildConfiguration(2); QVector<QString> splitBuildConfiguration(2);
const QString buildConfiguration = defaultAction()->property("subtitle").toString();
if (boldFm.width(buildConfiguration) <= availableWidth) { if (boldFm.width(buildConfiguration) <= availableWidth) {
// text fits in one line // text fits in one line
splitBuildConfiguration[0] = buildConfiguration; splitBuildConfiguration[0] = buildConfiguration;
@@ -295,9 +294,7 @@ QSize FancyToolButton::sizeHint() const
if (!projectName.isEmpty()) if (!projectName.isEmpty())
buttonSize += QSizeF(0, lineHeight + 2); buttonSize += QSizeF(0, lineHeight + 2);
const QString buildConfiguration = defaultAction()->property("subtitle").toString(); buttonSize += QSizeF(0, lineHeight*2 + 2);
if (!buildConfiguration.isEmpty())
buttonSize += QSizeF(0, lineHeight*2 + 2);
} }
return buttonSize.toSize(); return buttonSize.toSize();
} }