reverting the last change, the panel height is still the old one at that
point :) CCBUG:176280 svn path=/trunk/KDE/kdelibs/; revision=927158
This commit is contained in:
parent
59a0e9f0e8
commit
f4514950f4
@ -1177,26 +1177,20 @@ QVariant Containment::itemChange(GraphicsItemChange change, const QVariant &valu
|
|||||||
{
|
{
|
||||||
//FIXME if the applet is moved to another containment we need to unfocus it
|
//FIXME if the applet is moved to another containment we need to unfocus it
|
||||||
|
|
||||||
QVariant newValue = Applet::itemChange(change, value);
|
|
||||||
|
|
||||||
if (isContainment() && !ContainmentPrivate::s_positioning &&
|
if (isContainment() && !ContainmentPrivate::s_positioning &&
|
||||||
(change == QGraphicsItem::ItemSceneChange || change == QGraphicsItem::ItemPositionChange)) {
|
(change == QGraphicsItem::ItemSceneHasChanged || change == QGraphicsItem::ItemPositionHasChanged)) {
|
||||||
|
switch (d->type) {
|
||||||
//if the position will be actually changed, reposition before the change
|
case PanelContainment:
|
||||||
if (newValue == value) {
|
case CustomPanelContainment:
|
||||||
switch (d->type) {
|
d->positionPanel();
|
||||||
case PanelContainment:
|
break;
|
||||||
case CustomPanelContainment:
|
default:
|
||||||
d->positionPanel();
|
d->positionContainments();
|
||||||
break;
|
break;
|
||||||
default:
|
|
||||||
d->positionContainments();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return newValue;
|
return Applet::itemChange(change, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Containment::enableAction(const QString &name, bool enable)
|
void Containment::enableAction(const QString &name, bool enable)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user