copy the config over before setting our own containment, otherwise the screen gets set to -1 and then we copy it over. oh nos!
svn path=/trunk/KDE/kdelibs/; revision=889812
This commit is contained in:
parent
4b0bd4867c
commit
15ef681d83
6
view.cpp
6
view.cpp
|
@ -268,14 +268,14 @@ Containment *View::swapContainment(Plasma::Containment *existing, const QString
|
||||||
// ensure that the old containments configuration is up to date
|
// ensure that the old containments configuration is up to date
|
||||||
old->save(oldConfig);
|
old->save(oldConfig);
|
||||||
|
|
||||||
|
// Copy configuration to new containment
|
||||||
|
oldConfig.copyTo(&newConfig);
|
||||||
|
|
||||||
if (old == d->containment) {
|
if (old == d->containment) {
|
||||||
// set our containment to the new one
|
// set our containment to the new one
|
||||||
setContainment(c);
|
setContainment(c);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Copy configuration to new containment
|
|
||||||
oldConfig.copyTo(&newConfig);
|
|
||||||
|
|
||||||
// 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);
|
||||||
foreach (Applet *applet, c->applets()) {
|
foreach (Applet *applet, c->applets()) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user