[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-16 11:08:25
Message-ID: 20101016110825.D77B0AC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1186426 by mart:

resize to the proper sizes when expanding/collapsing the groups


 M  +9 -1      extender.cpp  
 M  +12 -6     extendergroup.cpp  


--- trunk/KDE/kdelibs/plasma/extenders/extender.cpp #1186425:1186426
@@ -512,6 +512,8 @@
     //remove the empty extender message if needed.
     d->updateEmptyExtenderLabel();
     d->updateBorders();
+
+    resize(d->mainWidget->effectiveSizeHint(Qt::PreferredSize));
 }
 
 void Extender::itemRemovedEvent(ExtenderItem *item)
@@ -528,12 +530,18 @@
         d->spacerWidget = 0;
     }
 
+    //FIXME: hardcoded number for the scrollbar
+    d->scrollWidget->setMinimumWidth(d->mainWidget->effectiveSizeHint(Qt::MinimumSize).width() \
+ 32); +    //FIXME: hardcoded number
+    d->scrollWidget->setMinimumHeight(qMin((qreal)300, \
d->mainWidget->effectiveSizeHint(Qt::MinimumSize).height())); +
     //add the empty extender message if needed.
     d->updateEmptyExtenderLabel();
     d->updateBorders();
 
     updateGeometry();
-    resize(effectiveSizeHint(Qt::PreferredSize));
+
+    resize(d->mainWidget->effectiveSizeHint(Qt::PreferredSize));
 }
 
 void Extender::itemHoverEnterEvent(ExtenderItem *item)
--- trunk/KDE/kdelibs/plasma/extenders/extendergroup.cpp #1186425:1186426
@@ -167,16 +167,19 @@
     config().writeEntry("groupCollapsed", d->collapsed);
     action("collapse")->setVisible(true);
     action("expand")->setVisible(false);
+
+    d->childsWidget->show();
+    static_cast<QGraphicsLinearLayout *>(layout())->addItem(d->childsWidget);
+    updateGeometry();
+
     foreach (ExtenderItem *item, extender()->attachedItems()) {
         if (item->group() == this) {
             item->show();
             extender()->itemAddedEvent(item);
         }
     }
-    d->childsWidget->show();
-    static_cast<QGraphicsLinearLayout *>(layout())->addItem(d->childsWidget);
-    updateGeometry();
-    extender()->resize(extender()->effectiveSizeHint(Qt::PreferredSize));
+
+    //extender()->resize(extender()->effectiveSizeHint(Qt::PreferredSize));
 }
 
 void ExtenderGroup::collapseGroup()
@@ -192,14 +195,17 @@
     config().writeEntry("groupCollapsed", d->collapsed);
     action("collapse")->setVisible(false);
     action("expand")->setVisible(true);
+
+    d->childsWidget->hide();
+    static_cast<QGraphicsLinearLayout *>(layout())->removeItem(d->childsWidget);
+    updateGeometry();
+
     foreach (ExtenderItem *item, extender()->attachedItems()) {
         if (item != this && item->group() == this) {
             item->hide();
             extender()->itemRemovedEvent(item);
         }
     }
-    d->childsWidget->hide();
-    static_cast<QGraphicsLinearLayout *>(layout())->removeItem(d->childsWidget);
 }
 
 void ExtenderGroup::resizeEvent(QGraphicsSceneResizeEvent *event)


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