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

backport fix for br#176280

Browse Source 
BUG:176280

svn path=/branches/KDE/4.2/kdelibs/; revision=928672
This commit is contained in:
Aaron J. Seigo 2009-02-19 19:58:04 +00:00
parent 6ebe8f0b9f
commit c4e98d21ed
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
containment.cpp
View File

@ -1071,6 +1071,19 @@ const QGraphicsItem *Containment::toolBoxItem() const
void Containment::resizeEvent(QGraphicsSceneResizeEvent *event) void Containment::resizeEvent(QGraphicsSceneResizeEvent *event)
{ {
Applet::resizeEvent(event); Applet::resizeEvent(event);
if (!ContainmentPrivate::s_positioning) {
switch (d->type) {
case Containment::PanelContainment:
case Containment::CustomPanelContainment:
d->positionPanel();
break;
default:
d->positionContainments();
break;
}
}
if (d->wallpaper) { if (d->wallpaper) {
d->wallpaper->setBoundingRect(boundingRect()); d->wallpaper->setBoundingRect(boundingRect());
} }
@ -1639,18 +1652,6 @@ void ContainmentPrivate::containmentConstraintsEvent(Plasma::Constraints constra
} }
} }
if (constraints & Plasma::SizeConstraint && !ContainmentPrivate::s_positioning) {
switch (q->containmentType()) {
case Containment::PanelContainment:
case Containment::CustomPanelContainment:
positionPanel();
break;
default:
positionContainments();
break;
}
}
if (toolBox && (constraints & Plasma::SizeConstraint || if (toolBox && (constraints & Plasma::SizeConstraint ||
constraints & Plasma::FormFactorConstraint || constraints & Plasma::FormFactorConstraint ||
constraints & Plasma::ScreenConstraint || constraints & Plasma::ScreenConstraint ||
@ -1826,6 +1827,7 @@ void ContainmentPrivate::positionPanel(bool force)
// we position panels in negative coordinates, and stack all horizontal // we position panels in negative coordinates, and stack all horizontal
// and all vertical panels with each other. // and all vertical panels with each other.
const QPointF p = q->pos(); const QPointF p = q->pos();
if (!force && if (!force &&