alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

be sure the layouts are notified all up the stack from extenderitem to group, to extender and its scrolling widget

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1205304
This commit is contained in:
Marco Martin 2010-12-10 20:00:18 +00:00
parent 125db2a0ad
commit bd29f6a61c
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extenders/extender.cpp
View File

@ -535,6 +535,8 @@ void Extender::itemRemovedEvent(ExtenderItem *item)
d->updateEmptyExtenderLabel(); d->updateEmptyExtenderLabel();
d->updateBorders(); d->updateBorders();
d->layout->updateGeometry();
static_cast<QGraphicsLayoutItem *>(d->scrollWidget)->updateGeometry();
updateGeometry(); updateGeometry();
resize(d->mainWidget->effectiveSizeHint(Qt::PreferredSize)); resize(d->mainWidget->effectiveSizeHint(Qt::PreferredSize));

21
extenders/extendergroup.cpp
View File

@ -216,6 +216,8 @@ void ExtenderGroup::resizeEvent(QGraphicsSceneResizeEvent *event)
bool ExtenderGroup::eventFilter(QObject *watched, QEvent *event) bool ExtenderGroup::eventFilter(QObject *watched, QEvent *event)
{ {
if (watched == d->childsWidget && event->type() == QEvent::GraphicsSceneResize) { if (watched == d->childsWidget && event->type() == QEvent::GraphicsSceneResize) {
static_cast<QGraphicsLayoutItem *>(extender()->d->scrollWidget)->updateGeometry();
static_cast<QGraphicsLayoutItem *>(extender())->updateGeometry();
//resize to the max between the extender size hint and ours (that's because the group can still not be in the extender layout) //resize to the max between the extender size hint and ours (that's because the group can still not be in the extender layout)
extender()->resize(extender()->effectiveSizeHint(Qt::PreferredSize).expandedTo(effectiveSizeHint(Qt::PreferredSize)).width(), extender()->size().height()); extender()->resize(extender()->effectiveSizeHint(Qt::PreferredSize).expandedTo(effectiveSizeHint(Qt::PreferredSize)).width(), extender()->size().height());
} }
@ -321,14 +323,19 @@ void ExtenderGroupPrivate::addItemToGroup(Plasma::ExtenderItem *item, const QPoi
layout->insertItem(insertIndexFromPos(pos), item); layout->insertItem(insertIndexFromPos(pos), item);
layout->activate(); layout->activate();
childsWidget->resize(childsWidget->size().width(),
childsWidget->effectiveSizeHint(Qt::PreferredSize).height());
if (!q->isVisible() && !q->items().isEmpty()) { if (!q->isVisible() && !q->items().isEmpty()) {
q->extender()->itemAddedEvent(q); q->extender()->itemAddedEvent(q);
q->show(); q->show();
} }
childsWidget->setVisible(!q->isGroupCollapsed()); childsWidget->setVisible(!q->isGroupCollapsed());
if (!q->isGroupCollapsed()) {
layout->updateGeometry();
static_cast<QGraphicsLayoutItem *>(q)->updateGeometry();
static_cast<QGraphicsLayoutItem *>(childsWidget)->updateGeometry();
static_cast<QGraphicsLayoutItem *>(q->extender()->d->scrollWidget)->updateGeometry();
}
q->extender()->resize(q->extender()->effectiveSizeHint(Qt::PreferredSize)); q->extender()->resize(q->extender()->effectiveSizeHint(Qt::PreferredSize));
} }
} }
@ -340,10 +347,14 @@ void ExtenderGroupPrivate::removeItemFromGroup(Plasma::ExtenderItem *item)
q->extender()->itemRemovedEvent(q); q->extender()->itemRemovedEvent(q);
q->hide(); q->hide();
} }
childsWidget->resize(childsWidget->size().width(),
childsWidget->effectiveSizeHint(Qt::PreferredSize).height());
layout->removeItem(item); layout->removeItem(item);
item->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); item->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
layout->updateGeometry();
static_cast<QGraphicsLayoutItem *>(q)->updateGeometry();
static_cast<QGraphicsLayoutItem *>(childsWidget)->updateGeometry();
static_cast<QGraphicsLayoutItem *>(q->extender()->d->scrollWidget)->updateGeometry();
q->extender()->resize(q->extender()->effectiveSizeHint(Qt::PreferredSize)); q->extender()->resize(q->extender()->effectiveSizeHint(Qt::PreferredSize));
} }
} }