* containments should never have the applet background by default
* always call updateConstraints, not constraintsEvent directly to avoid unecessary multiple calls svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=801817
This commit is contained in:
parent
85f7ded2b4
commit
b00807cee8
@ -80,7 +80,7 @@ Containment::Containment(QGraphicsItem* parent,
|
|||||||
// WARNING: do not access config() OR globalConfig() in this method!
|
// WARNING: do not access config() OR globalConfig() in this method!
|
||||||
// that requires a scene, which is not available at this point
|
// that requires a scene, which is not available at this point
|
||||||
setPos(0, 0);
|
setPos(0, 0);
|
||||||
setBackgroundHints(DefaultBackground);
|
setBackgroundHints(NoBackground);
|
||||||
setContainmentType(CustomContainment);
|
setContainmentType(CustomContainment);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -217,7 +217,6 @@ void Containment::setContainmentType(Containment::Type type)
|
|||||||
QGraphicsWidget *activityTool = addToolBoxTool("addSiblingContainment", "list-add", i18n("Add Activity"));
|
QGraphicsWidget *activityTool = addToolBoxTool("addSiblingContainment", "list-add", i18n("Add Activity"));
|
||||||
connect(activityTool, SIGNAL(clicked()), this, SLOT(addSiblingContainment()));
|
connect(activityTool, SIGNAL(clicked()), this, SLOT(addSiblingContainment()));
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if (isContainment() && type == PanelContainment) {
|
} else if (isContainment() && type == PanelContainment) {
|
||||||
if (!d->toolBox) {
|
if (!d->toolBox) {
|
||||||
d->createToolBox();
|
d->createToolBox();
|
||||||
@ -980,7 +979,7 @@ void Containment::Private::containmentConstraintsEvent(Plasma::Constraints const
|
|||||||
|
|
||||||
// tell the applets too
|
// tell the applets too
|
||||||
foreach (Applet *a, applets) {
|
foreach (Applet *a, applets) {
|
||||||
a->constraintsEvent(ImmutableConstraint);
|
a->updateConstraints(ImmutableConstraint);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user