alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

trigger a re-calc of the icon size when text is set. fixes icon presentation on reload at startup

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=758190
This commit is contained in:
Aaron J. Seigo 2008-01-07 05:09:09 +00:00
parent 7b5c62982d
commit 483851b361
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
widgets/icon.cpp
View File

@ -280,7 +280,7 @@ void Icon::init()
d->setVerticalMargin(Private::ItemMargin, 0, 0); d->setVerticalMargin(Private::ItemMargin, 0, 0);
d->setActiveMargins(); d->setActiveMargins();
d->currentSize = QSizeF(-1,-1); d->currentSize = QSizeF(-1, -1);
} }
void Icon::addAction(QAction *action) void Icon::addAction(QAction *action)
@ -407,7 +407,7 @@ void Icon::layoutIcons(const QStyleOptionGraphicsItem *option)
d->verticalMargin[Private::TextMargin].bottom; d->verticalMargin[Private::TextMargin].bottom;
//never make a label higher than half the total height //never make a label higher than half the total height
heightAvail = qMax(heightAvail, d->currentSize.height()/2); heightAvail = qMax(heightAvail, d->currentSize.height()/2);
}else{ } else {
heightAvail = d->currentSize.height(); heightAvail = d->currentSize.height();
} }
@ -416,13 +416,13 @@ void Icon::layoutIcons(const QStyleOptionGraphicsItem *option)
iconWidth = d->currentSize.width() - iconWidth = d->currentSize.width() -
d->horizontalMargin[Private::IconMargin].left - d->horizontalMargin[Private::IconMargin].left -
d->horizontalMargin[Private::IconMargin].right; d->horizontalMargin[Private::IconMargin].right;
}else{ } else {
iconWidth = heightAvail - iconWidth = heightAvail -
d->verticalMargin[Private::IconMargin].top - d->verticalMargin[Private::IconMargin].top -
d->verticalMargin[Private::IconMargin].bottom; d->verticalMargin[Private::IconMargin].bottom;
} }
//Horizontal layout //Horizontal layout
}else{ } else {
qreal widthAvail; qreal widthAvail;
QFontMetricsF fm(font()); QFontMetricsF fm(font());
@ -440,7 +440,7 @@ void Icon::layoutIcons(const QStyleOptionGraphicsItem *option)
textWidth - textWidth -
d->horizontalMargin[Private::TextMargin].left - d->horizontalMargin[Private::TextMargin].left -
d->horizontalMargin[Private::TextMargin].right; d->horizontalMargin[Private::TextMargin].right;
}else{ } else {
widthAvail = d->currentSize.width(); widthAvail = d->currentSize.width();
} }
@ -449,7 +449,7 @@ void Icon::layoutIcons(const QStyleOptionGraphicsItem *option)
iconWidth = d->currentSize.height() - iconWidth = d->currentSize.height() -
d->verticalMargin[Private::IconMargin].top - d->verticalMargin[Private::IconMargin].top -
d->verticalMargin[Private::IconMargin].bottom; d->verticalMargin[Private::IconMargin].bottom;
}else{ } else {
iconWidth = widthAvail - iconWidth = widthAvail -
d->horizontalMargin[Private::IconMargin].left - d->horizontalMargin[Private::IconMargin].left -
d->horizontalMargin[Private::IconMargin].right; d->horizontalMargin[Private::IconMargin].right;
@ -894,6 +894,8 @@ void Icon::drawActionButtonBase(QPainter* painter, const QSize &size, int elemen
void Icon::setText(const QString& text) void Icon::setText(const QString& text)
{ {
d->text = text; d->text = text;
// cause a relayout
d->currentSize = QSizeF(-1, -1);
} }
QString Icon::text() const QString Icon::text() const
@ -904,6 +906,8 @@ QString Icon::text() const
void Icon::setInfoText(const QString& text) void Icon::setInfoText(const QString& text)
{ {
d->infoText = text; d->infoText = text;
// cause a relayout
d->currentSize = QSizeF(-1, -1);
} }
QString Icon::infoText() const QString Icon::infoText() const