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

don't mess with the containment's screen/desktop if the "new" containment is the same as the old one; happens when we're not init'd yet and looking for containments to use, resuts in confusing the shell app

Browse Source 
BUG:192245

svn path=/trunk/KDE/kdelibs/; revision=976442
This commit is contained in:
Aaron J. Seigo 2009-06-01 17:31:58 +00:00
parent d5ce775e22
commit 3454a5ddc6
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
view.cpp
View File

@ -231,8 +231,10 @@ void View::setContainment(Plasma::Containment *containment)
int screen = -1;
int desktop = -1;
if (oldContainment) {
screen = d->containment->screen();
desktop = d->containment->desktop();
if (oldContainment != containment) {
screen = d->containment->screen();
desktop = d->containment->desktop();
}
} else {
setScene(containment->scene());
}
@ -245,10 +247,10 @@ void View::setContainment(Plasma::Containment *containment)
int otherScreen = containment->screen();
int otherDesktop = containment->desktop();
if (screen > -1) {
d->lastScreen = screen;
d->lastDesktop = desktop;
//kDebug() << "set screen from setContainment due to old containment";
oldContainment->setScreen(-1, -1);
containment->setScreen(-1, -1);
containment->setScreen(screen, desktop);
@ -257,8 +259,9 @@ void View::setContainment(Plasma::Containment *containment)
d->lastDesktop = otherDesktop;
}
if (oldContainment && otherScreen > -1) {
if (oldContainment && oldContainment != d->containment && otherScreen > -1) {
// assign the old containment the old screen/desktop
//kDebug() << "set screen from setContainment" << screen << otherScreen << desktop << otherDesktop;
oldContainment->setScreen(otherScreen, otherDesktop);
}