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

don't do the Containment resizeEvent dance unless it is actually being used as a containment

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1118056
This commit is contained in:
Aaron J. Seigo 2010-04-23 19:06:55 +00:00
parent 59505c7f07
commit 9278caf4a0
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
containment.cpp
View File

@ -1021,11 +1021,9 @@ void Containment::setScreen(int newScreen, int newDesktop)
} }
} }
if (newScreen < numScreens && newScreen > -1) { if (newScreen < numScreens && newScreen > -1 &&
if (d->type == DesktopContainment || (d->type == DesktopContainment || d->type >= CustomContainment)) {
d->type >= CustomContainment) { resize(corona()->screenGeometry(newScreen).size());
resize(corona()->screenGeometry(newScreen).size());
}
} }
int oldDesktop = d->desktop; int oldDesktop = d->desktop;
@ -1595,14 +1593,16 @@ void Containment::resizeEvent(QGraphicsSceneResizeEvent *event)
{ {
Applet::resizeEvent(event); Applet::resizeEvent(event);
if (d->isPanelContainment()) { if (isContainment()) {
d->positionPanel(); if (d->isPanelContainment()) {
} else if (corona()) { d->positionPanel();
QMetaObject::invokeMethod(corona(), "layoutContainments"); } else if (corona()) {
} QMetaObject::invokeMethod(corona(), "layoutContainments");
}
if (d->wallpaper) { if (d->wallpaper) {
d->wallpaper->setBoundingRect(QRectF(QPointF(0, 0), size())); d->wallpaper->setBoundingRect(QRectF(QPointF(0, 0), size()));
}
} }
} }