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

re-enable some debug needed to work out problems with multiscreen

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=897316
This commit is contained in:
Aaron J. Seigo 2008-12-15 18:28:28 +00:00
parent 6e6cb12b9b
commit 85161ce13f
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

@ -780,7 +780,7 @@ void Containment::setScreen(int screen, int desktop)
// //
// a screen of -1 means no associated screen. // a screen of -1 means no associated screen.
Containment *swapScreensWith(0); Containment *swapScreensWith(0);
if (d->type == DesktopContainment || d->type == CustomContainment) { if (d->type == DesktopContainment || d->type >= CustomContainment) {
// we want to listen to changes in work area if our screen changes // we want to listen to changes in work area if our screen changes
if (d->screen < 0 && screen > -1) { if (d->screen < 0 && screen > -1) {
connect(KWindowSystem::self(), SIGNAL(workAreaChanged()), connect(KWindowSystem::self(), SIGNAL(workAreaChanged()),
@ -794,16 +794,16 @@ void Containment::setScreen(int screen, int desktop)
// sanity check to make sure someone else doesn't have this screen already! // sanity check to make sure someone else doesn't have this screen already!
Containment *currently = corona()->containmentForScreen(screen, desktop); Containment *currently = corona()->containmentForScreen(screen, desktop);
if (currently && currently != this) { if (currently && currently != this) {
//kDebug() << "currently is on screen" << currently->screen() kDebug() << "currently is on screen" << currently->screen()
// << "and is" << currently->name() << "and is" << currently->name()
// << (QObject*)currently << (QObject*)this; << (QObject*)currently << (QObject*)this;
currently->setScreen(-1); currently->setScreen(-1);
swapScreensWith = currently; swapScreensWith = currently;
} }
} }
} }
//kDebug() << "setting screen to" << screen << "and we are a" << containmentType(); kDebug() << "setting screen to" << screen << "and we are a" << containmentType();
Q_ASSERT(corona()); Q_ASSERT(corona());
int numScreens = corona()->numScreens(); int numScreens = corona()->numScreens();
if (screen < -1) { if (screen < -1) {
@ -811,7 +811,7 @@ void Containment::setScreen(int screen, int desktop)
} }
//kDebug() << "setting screen to " << screen << "and type is" << containmentType(); kDebug() << "setting screen to " << screen << "and type is" << containmentType();
if (screen < numScreens && screen > -1) { if (screen < numScreens && screen > -1) {
if (containmentType() == DesktopContainment || if (containmentType() == DesktopContainment ||
containmentType() >= CustomContainment) { containmentType() >= CustomContainment) {