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

clean up a bit

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1200096
This commit is contained in:
Aaron J. Seigo 2010-11-23 22:21:24 +00:00
parent 3e354c4e81
commit 2b2fb47e20
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
containment.cpp
View File

@ -995,10 +995,7 @@ void ContainmentPrivate::setScreen(int newScreen, int newDesktop, bool preventIn
<< "desktop" << currently->desktop() << "desktop" << currently->desktop()
<< "and is" << currently->activity() << "and is" << currently->activity()
<< (QObject*)currently << "i'm" << (QObject*)q; << (QObject*)currently << "i'm" << (QObject*)q;
//kDebug() << "setScreen due to swap"; currently->setScreen(-1, currently->desktop());
//make the view completely forget about us
emit q->screenChanged(screen, -1, q);
currently->setScreen(-1, newDesktop);
swapScreensWith = currently; swapScreensWith = currently;
} }
} }
@ -1015,11 +1012,14 @@ void ContainmentPrivate::setScreen(int newScreen, int newDesktop, bool preventIn
int oldScreen = screen; int oldScreen = screen;
screen = newScreen; screen = newScreen;
q->updateConstraints(Plasma::ScreenConstraint); q->updateConstraints(Plasma::ScreenConstraint);
if (oldScreen != newScreen || oldDesktop != newDesktop) { if (oldScreen != newScreen || oldDesktop != newDesktop) {
/*
kDebug() << "going to signal change for" << q
<< ", old screen & desktop:" << oldScreen << oldDesktop
<< ", new:" << screen << desktop;
*/
KConfigGroup c = q->config(); KConfigGroup c = q->config();
c.writeEntry("screen", screen); c.writeEntry("screen", screen);
c.writeEntry("desktop", desktop); c.writeEntry("desktop", desktop);