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

base the size on the option rect

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=986456
This commit is contained in:
Aaron J. Seigo 2009-06-24 16:54:51 +00:00
parent f46f3fcd45
commit 367140c8e1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
widgets/iconwidget.cpp
View File

@ -472,11 +472,11 @@ QSizeF IconWidgetPrivate::displaySizeHint(const QStyleOptionGraphicsItem *option
void IconWidgetPrivate::layoutIcons(const QStyleOptionGraphicsItem *option)
{
if (q->size() == currentSize) {
if (option->rect.size() == currentSize) {
return;
}
currentSize = q->size();
currentSize = option->rect.size();
setActiveMargins();
//calculate icon size based on the available space
@ -646,10 +646,9 @@ QPixmap IconWidgetPrivate::decoration(const QStyleOptionGraphicsItem *option, bo
result = icon.pixmap(size, mode, state);
}
if (usePressedEffect) {
result = result.scaled(result.size() * 0.9, Qt::KeepAspectRatio);
}
if (usePressedEffect) {
result = result.scaled(result.size() * 0.9, Qt::KeepAspectRatio);
}
if (!result.isNull() && useHoverEffect) {
KIconEffect *effect = KIconLoader::global()->iconEffect();