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

List:       kde-commits
Subject:    KDE/kdelibs/plasma/extenders
From:       Marco Martin <notmart () gmail ! com>
Date:       2010-10-12 10:02:19
Message-ID: 20101012100219.4F6A1AC895 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1185117 by mart:

* hide the icon when a null one is set
* center the title text


 M  +0 -3      extendergroup.cpp  
 M  +11 -0     extenderitem.cpp  


--- trunk/KDE/kdelibs/plasma/extenders/extendergroup.cpp #1185116:1185117
@@ -138,10 +138,7 @@
 void ExtenderGroup::setAutoCollapse(bool collapse)
 {
     d->autoCollapse = collapse;
-    if (collapse) {
-        setCollapsed(d->collapsed);
     }
-}
 
 bool ExtenderGroup::isGroupCollapsed() const
 {
--- trunk/KDE/kdelibs/plasma/extenders/extenderitem.cpp #1185116:1185117
@@ -159,6 +159,8 @@
     d->collapseIcon = new IconWidget(d->toolbox);
     d->collapseIcon->setCursor(Qt::ArrowCursor);
     d->titleLabel = new Label(d->toolbox);
+    d->titleLabel->setWordWrap(false);
+    d->titleLabel->setAlignment(Qt::AlignCenter);
 
     d->toolboxLayout->addItem(d->collapseIcon);
     d->toolboxLayout->addItem(d->titleLabel);
@@ -322,6 +324,7 @@
     if (d->collapseIcon->icon().isNull() || icon.cacheKey() != d->collapseIcon->icon().cacheKey()) {
         d->iconName.clear();
         d->collapseIcon->setIcon(icon);
+        d->collapseIcon->setVisible(!icon.isNull());
     }
 }
 
@@ -841,6 +844,7 @@
     int closeIndex = -1;
     int returnToSourceIndex = -1;
     const int startingIndex = 2; // collapse item is index 0, title label is 1
+    int lastIndex = 2;
     const QSizeF widgetSize = collapseIcon->sizeFromIconSize(toolbox->iconSize());
 
     QSet<QAction*> shownActions = actionsInOrder.toSet();
@@ -903,6 +907,7 @@
                 button->setMaximumHeight(widgetSize.height());
                 button->setCursor(Qt::ArrowCursor);
                 toolboxLayout->insertItem(startingIndex, button);
+                ++lastIndex;
             } else {
                 if (!icon) {
                     icon = new IconWidget(q);
@@ -916,6 +921,7 @@
                 icon->setMaximumSize(widgetSize);
                 icon->setCursor(Qt::ArrowCursor);
                 toolboxLayout->insertItem(startingIndex, icon);
+                ++lastIndex;
             }
         }
     }
@@ -941,6 +947,7 @@
         } else {
             toolboxLayout->insertItem(closeIndex - 1, returnToSourceIcon);
         }
+        ++lastIndex;
     }
 
     //add the close icon if desired.
@@ -961,7 +968,11 @@
         destroyButton->setMaximumSize(widgetSize);
         destroyButton->setCursor(Qt::ArrowCursor);
         toolboxLayout->addItem(destroyButton);
+        ++lastIndex;
     }
+
+    //to keep the text really centered
+    toolboxLayout->setItemSpacing(0, KIconLoader::SizeSmall * (lastIndex - 2));
 }
 
 Applet *ExtenderItemPrivate::hostApplet() const
[prev in list] [next in list] [prev in thread] [next in thread]