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

save the desktop setting when it changes in setScreen just as we do for the screen

Browse Source 
CCBUG:192245

svn path=/trunk/KDE/kdelibs/; revision=976441
This commit is contained in:
Aaron J. Seigo 2009-06-01 17:30:52 +00:00
parent 0f8a89e2d4
commit d5ce775e22
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
containment.cpp
View File

@ -295,6 +295,7 @@ void Containment::restore(KConfigGroup &group)
setLocation((Plasma::Location)group.readEntry("location", (int)d->location));
setFormFactor((Plasma::FormFactor)group.readEntry("formfactor", (int)d->formFactor));
//kDebug() << "setScreen from restore";
setScreen(group.readEntry("screen", d->screen), group.readEntry("desktop", d->desktop));
setActivity(group.readEntry("activity", QString()));
@ -843,7 +844,7 @@ void Containment::setScreen(int newScreen, int newDesktop)
newDesktop = -1;
}
kDebug() << activity() << "setting screen to " << newScreen << newDesktop << "and type is" << d->type;
//kDebug() << activity() << "setting screen to " << newScreen << newDesktop << "and type is" << d->type;
Containment *swapScreensWith(0);
if (d->type == DesktopContainment || d->type >= CustomContainment) {
@ -862,6 +863,7 @@ void Containment::setScreen(int newScreen, int newDesktop)
<< "desktop" << currently->desktop()
<< "and is" << currently->activity()
<< (QObject*)currently << "i'm" << (QObject*)this;
//kDebug() << "setScreen due to swap";
currently->setScreen(-1, newDesktop);
swapScreensWith = currently;
}
@ -883,15 +885,19 @@ void Containment::setScreen(int newScreen, int newDesktop)
updateConstraints(Plasma::ScreenConstraint);
if (oldScreen != newScreen) {
emit screenChanged(oldScreen, newScreen, this);
if (oldScreen != newScreen || oldDesktop != newDesktop) {
if (oldScreen != newScreen) {
emit screenChanged(oldScreen, newScreen, this);
}
KConfigGroup c = config();
c.writeEntry("screen", d->screen);
c.writeEntry("desktop", d->desktop);
emit configNeedsSaving();
}
if (swapScreensWith) {
//kDebug() << "setScreen due to swap, part 2";
swapScreensWith->setScreen(oldScreen, oldDesktop);
}