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

List:       kde-commits
Subject:    branches/KDE/4.2/kdebase/workspace/plasma/applets/quicklaunch
From:       Lukas Appelhans <l.appelhans () gmx ! de>
Date:       2009-03-08 19:14:36
Message-ID: 1236539676.238989.25182.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 936979 by lappelhans:

Backport rev 936572
Thanks to Chani for the svnbackport-script-tip!


 M  +3 -8      quicklaunchApplet.cpp  


--- branches/KDE/4.2/kdebase/workspace/plasma/applets/quicklaunch/quicklaunchApplet.cpp \
#936978:936979 @@ -141,16 +141,11 @@
         if (!m_innerLayout) {
             return sizeHint;
         }
+        qreal newWidth = m_innerLayout->columnCount() * sizeHint.height() / qMax(1, \
m_innerLayout->rowCount());  if (m_icons.size() > m_visibleIcons) {
-            qreal factor = m_innerLayout->rowCount() * m_innerLayout->columnCount() \
                + size().height();
-            if (factor) {
-                sizeHint.setWidth(sizeHint.height() / factor);
-            }
+            sizeHint.setWidth(newWidth + sizeHint.height());
         } else {
-            qreal factor = m_innerLayout->rowCount() * m_innerLayout->columnCount();
-            if (factor) {
-                sizeHint.setWidth(sizeHint.height() / factor);
-            }
+            sizeHint.setWidth(newWidth);
         }
         return sizeHint;
     }


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