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

Merge remote-tracking branch 'origin/KDE/4.8'

Browse Source
This commit is contained in:
David Faure 2012-04-18 12:19:00 +02:00
commit 54b2bac95e
3 changed files with 5 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);

2
widgets/lineedit.cpp
View File

@ -64,10 +64,12 @@ LineEdit::LineEdit(QGraphicsWidget *parent)
d->background->setImagePath("widgets/lineedit"); d->background->setImagePath("widgets/lineedit");
d->background->setCacheAllRenderedFrames(true); d->background->setCacheAllRenderedFrames(true);
#if 0 // causes bug 290111
FocusIndicator *indicator = new FocusIndicator(this, d->background); FocusIndicator *indicator = new FocusIndicator(this, d->background);
if (d->background->hasElement("hint-focus-over-base")) { if (d->background->hasElement("hint-focus-over-base")) {
indicator->setFlag(QGraphicsItem::ItemStacksBehindParent, false); indicator->setFlag(QGraphicsItem::ItemStacksBehindParent, false);
} }
#endif
setNativeWidget(new KLineEdit); setNativeWidget(new KLineEdit);
} }