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

clean up and generalize setScreen

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1128637
This commit is contained in:
Aaron J. Seigo 2010-05-19 20:03:31 +00:00
parent fe70333098
commit 615aef4915
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
view.cpp
View File

@ -171,23 +171,34 @@ View::~View()
void View::setScreen(int screen, int desktop)
{
if (screen > -1) {
// -1 == All desktops
if (desktop < -1 || desktop > KWindowSystem::numberOfDesktops() - 1) {
desktop = -1;
}
if (screen < 0) {
return;
}
d->lastScreen = screen;
d->lastDesktop = desktop;
// handle views that are working with panel containment types
if (d->containment &&
(d->containment->type() == Containment::PanelContainment ||
d->containment->type() == Containment::CustomPanelContainment)) {
d->containment->setScreen(screen, desktop);
return;
}
Plasma::Corona *corona = qobject_cast<Plasma::Corona*>(scene());
if (corona) {
Containment *containment = corona->containmentForScreen(screen, desktop);
// handle desktop views
// -1 == All desktops
if (desktop < -1 || desktop > KWindowSystem::numberOfDesktops() - 1) {
desktop = -1;
}
if (containment) {
d->containment = 0; //so that we don't end up on the old containment's screen
setContainment(containment);
}
d->lastScreen = screen;
d->lastDesktop = desktop;
Plasma::Corona *corona = qobject_cast<Plasma::Corona*>(scene());
if (corona) {
Containment *containment = corona->containmentForScreen(screen, desktop);
if (containment) {
d->containment = 0; //so that we don't end up on the old containment's screen
setContainment(containment);
}
}
}