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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets/quicklaunch
From:       Lukas Appelhans <l.appelhans () gmx ! de>
Date:       2009-03-22 16:28:16
Message-ID: 1237739296.019487.21748.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 942828 by lappelhans:

Default to s_defaultIconSize which is the minimumIconSize as well now, there seems to \
be no way to calculate the iconSize from the contentsRect().height() at the \
beginning, since the applet seems to have a size of 0 when refactored the first time


 M  +10 -2     quicklaunchApplet.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/quicklaunch/quicklaunchApplet.cpp \
#942827:942828 @@ -91,9 +91,9 @@
 void QuicklaunchApplet::init()
 {
     KConfigGroup cg = config();
-    m_iconSize = qMax(1, (int)cg.readEntry("iconSize", contentsRect().height() / \
2)); +    m_iconSize = qMax(s_defaultIconSize, (int)cg.readEntry("iconSize", \
                contentsRect().height() / 2));
     m_visibleIcons = qMax(1, cg.readEntry("visibleIcons", m_visibleIcons));
-    m_dialogIconSize = qMax(1, (int)cg.readEntry("dialogIconSize", \
contentsRect().height() / 2)); +    m_dialogIconSize = qMax(s_defaultIconSize, \
(int)cg.readEntry("dialogIconSize", contentsRect().height() / 2));  
     // Initialize outer layout
     m_layout = new QGraphicsLinearLayout(this);
@@ -165,6 +165,9 @@
 {
     clearLayout(m_innerLayout);
 
+    m_iconSize = qMax(m_iconSize, s_defaultIconSize);//Don't accept values under 16
+    m_dialogIconSize = qMax(m_iconSize, s_defaultIconSize);
+
     if (m_dialogLayout) {
         clearLayout(m_dialogLayout);
         m_dialogLayout->setRowCount((int)(size().height() / m_dialogIconSize));
@@ -279,6 +282,11 @@
     uiConfig.dialogIconSizeSpin->setMaximum(dialogHeight);
     uiConfig.dialogIconSizeSlider->setMaximum(dialogHeight);
 
+    uiConfig.iconSizeSpin->setMinimum(s_defaultIconSize);
+    uiConfig.iconSizeSlider->setMinimum(s_defaultIconSize);
+    uiConfig.dialogIconSizeSpin->setMinimum(s_defaultIconSize);
+    uiConfig.dialogIconSizeSlider->setMinimum(s_defaultIconSize);
+
     uiConfig.iconSizeSpin->setValue(m_iconSize);
     uiConfig.iconSizeSlider->setValue(m_iconSize);
     uiConfig.dialogIconSizeSpin->setValue(m_dialogIconSize);


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