[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/plasma/widgets
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-05-25 19:43:14
Message-ID: 20100525194314.D203FAC8BF () svn ! kde ! org
[Download RAW message or body]

SVN commit 1130605 by aseigo:

yes, that makes a bit more sense ;)


 M  +3 -3      iconwidget.cpp  


--- trunk/KDE/kdelibs/plasma/widgets/iconwidget.cpp #1130604:1130605
@@ -672,7 +672,7 @@
 {
     if (which == Qt::PreferredSize) {
         if (d->preferredIconSize.isValid()) {
-            return sizeFromIconSize(qMax(d->preferredIconSize.height(), d->preferredIconSize.height()));
+            return sizeFromIconSize(qMax(d->preferredIconSize.height(), d->preferredIconSize.width()));
         }
         int iconSize = KIconLoader::SizeMedium;
         if (d->iconSvg) {
@@ -688,12 +688,12 @@
         return sizeFromIconSize(iconSize);
     } else if (which == Qt::MinimumSize) {
         if (d->minimumIconSize.isValid()) {
-            return sizeFromIconSize(qMax(d->minimumIconSize.height(), d->minimumIconSize.height()));
+            return sizeFromIconSize(qMax(d->minimumIconSize.height(), d->minimumIconSize.width()));
         }
         return sizeFromIconSize(KIconLoader::SizeSmall);
     } else {
         if (d->maximumIconSize.isValid()) {
-            return sizeFromIconSize(qMax(d->maximumIconSize.height(), d->maximumIconSize.height()));
+            return sizeFromIconSize(qMax(d->maximumIconSize.height(), d->maximumIconSize.width()));
         }
         return QGraphicsWidget::sizeHint(which, constraint);
     }
[prev in list] [next in list] [prev in thread] [next in thread]