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

when the icon is horizontal and there is no text take the min between width and height as icon size.

Browse Source 
among other things fixes the unhide arrow of the systray

svn path=/trunk/KDE/kdelibs/; revision=1071365
This commit is contained in:
Marco Martin 2010-01-07 21:58:51 +00:00
parent 35d8587114
commit c1e947a768
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
widgets/iconwidget.cpp
View File

@ -546,9 +546,12 @@ void IconWidgetPrivate::layoutIcons(const QStyleOptionGraphicsItem *option)
//if there is text resize the icon in order to make room for the text
if (text.isEmpty() && infoText.isEmpty()) {
// with no text, we just take up the whole geometry
iconWidth = currentSize.height() -
horizontalMargin[IconWidgetPrivate::IconMargin].left -
horizontalMargin[IconWidgetPrivate::IconMargin].right;
iconWidth = qMin(currentSize.height() -
horizontalMargin[IconWidgetPrivate::IconMargin].left -
horizontalMargin[IconWidgetPrivate::IconMargin].right,
currentSize.width() -
horizontalMargin[IconWidgetPrivate::IconMargin].left -
horizontalMargin[IconWidgetPrivate::IconMargin].right);
} else {
iconWidth = currentSize.height() -
verticalMargin[IconWidgetPrivate::IconMargin].top -