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

unbreak restoration of applets when switching containments

Browse Source
This commit is contained in:
Aaron Seigo 2012-03-19 20:40:14 +01:00
parent 816efa3b16
commit dd378ebead
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
containment.h
View File

@ -664,6 +664,7 @@ Q_SIGNALS:
friend class ContainmentPrivate; friend class ContainmentPrivate;
friend class ContainmentActions; friend class ContainmentActions;
friend class PopupApplet; friend class PopupApplet;
friend class View;
ContainmentPrivate *const d; ContainmentPrivate *const d;
}; };

8
view.cpp
View File

@ -28,6 +28,7 @@
#include "corona.h" #include "corona.h"
#include "containment.h" #include "containment.h"
#include "private/containment_p.h"
#include "wallpaper.h" #include "wallpaper.h"
using namespace Plasma; using namespace Plasma;
@ -338,13 +339,8 @@ Containment *View::swapContainment(Plasma::Containment *existing, const QString
// load the configuration of the old containment into the new one // load the configuration of the old containment into the new one
c->restore(newConfig); c->restore(newConfig);
c->updateConstraints(Plasma::StartupCompletedConstraint); c->updateConstraints(Plasma::StartupCompletedConstraint);
c->flushPendingConstraintsEvents(); c->d->initApplets();
emit corona->containmentAdded(c); emit corona->containmentAdded(c);
foreach (Applet *applet, c->applets()) {
applet->init();
// We have to flush the applet constraints manually
applet->flushPendingConstraintsEvents();
}
// destroy the old one // destroy the old one
old->destroy(false); old->destroy(false);