From 1e247fa7491274afacd1e52244dbdb66420fcd19 Mon Sep 17 00:00:00 2001 From: Jason Stubbs Date: Sat, 5 Jan 2008 10:35:32 +0000 Subject: [PATCH] Flush containment constraints as soon as they are loaded so that they can be acted upon without having to wait for the event loop. This is needed so that the desktop doesn't temporarily appear white when a wallpaper hasn't been set. svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=757548 --- containment.cpp | 1 + corona.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/containment.cpp b/containment.cpp index aa765f7dc..45e294aa8 100644 --- a/containment.cpp +++ b/containment.cpp @@ -146,6 +146,7 @@ void Containment::loadConstraints(KConfigGroup* group) setLocation((Plasma::Location)group->readEntry("location", (int)d->location)); setFormFactor((Plasma::FormFactor)group->readEntry("formfactor", (int)d->formFactor)); setScreen(group->readEntry("screen", d->screen)); + flushUpdatedConstraints(); } void Containment::saveConstraints(KConfigGroup* group) const diff --git a/corona.cpp b/corona.cpp index 729fd27d5..1ea0505c4 100644 --- a/corona.cpp +++ b/corona.cpp @@ -267,6 +267,7 @@ void Corona::loadApplets(const QString& configName) Containment* c = addContainment("desktop"); c->setScreen(i); c->setFormFactor(Plasma::Planar); + c->flushUpdatedConstraints(); } } } @@ -297,6 +298,7 @@ void Corona::loadDefaultSetup() Containment* c = addContainment("desktop"); c->setScreen(i); c->setFormFactor(Plasma::Planar); + c->flushUpdatedConstraints(); if (g.x() <= topLeftCorner.x() && g.y() >= topLeftCorner.y()) { topLeftCorner = g.topLeft();