check for missing screens after creating existing ones
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=742837
This commit is contained in:
parent
22893bd077
commit
c746f91370
22
corona.cpp
22
corona.cpp
@ -199,17 +199,6 @@ void Corona::loadApplets(const QString& configName)
|
|||||||
if (d->containments.count() < 1) {
|
if (d->containments.count() < 1) {
|
||||||
loadDefaultSetup();
|
loadDefaultSetup();
|
||||||
} else {
|
} 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) {
|
foreach (Containment* containment, d->containments) {
|
||||||
QString cid = QString::number(containment->id());
|
QString cid = QString::number(containment->id());
|
||||||
containment->init();
|
containment->init();
|
||||||
@ -222,6 +211,17 @@ void Corona::loadApplets(const QString& configName)
|
|||||||
|
|
||||||
containment->flushUpdatedConstraints();
|
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());
|
setImmutable(config.isImmutable());
|
||||||
|
Loading…
Reference in New Issue
Block a user