check for missing screens after creating existing ones

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=742837
This commit is contained in:
Aaron J. Seigo 2007-11-29 00:19:03 +00:00
parent 22893bd077
commit c746f91370

View File

@ -199,17 +199,6 @@ void Corona::loadApplets(const QString& configName)
if (d->containments.count() < 1) {
loadDefaultSetup();
} else {
// quick sanity check to ensure we have containments for each screen!
int numScreens = QApplication::desktop()->numScreens();
for (int i = 0; i < numScreens; ++i) {
if (!containmentForScreen(i)) {
//TODO: should we look for containments that aren't asigned but already exist?
Containment* c = addContainment("desktop");
c->setScreen(i);
c->setFormFactor(Plasma::Planar);
}
}
foreach (Containment* containment, d->containments) {
QString cid = QString::number(containment->id());
containment->init();
@ -222,6 +211,17 @@ void Corona::loadApplets(const QString& configName)
containment->flushUpdatedConstraints();
}
// quick sanity check to ensure we have containments for each screen!
int numScreens = QApplication::desktop()->numScreens();
for (int i = 0; i < numScreens; ++i) {
if (!containmentForScreen(i)) {
//TODO: should we look for containments that aren't asigned but already exist?
Containment* c = addContainment("desktop");
c->setScreen(i);
c->setFormFactor(Plasma::Planar);
}
}
}
setImmutable(config.isImmutable());