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

push the storage of a view's associated desktop down into the containment just like the screen

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=885333
This commit is contained in:
Aaron J. Seigo 2008-11-17 04:44:10 +00:00
parent 160e70ccd0
commit 35e4fd39b2
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
view.cpp
View File

@ -40,7 +40,6 @@ public:
containment(0), containment(0),
drawWallpaper(true), drawWallpaper(true),
trackChanges(true), trackChanges(true),
desktop(-1),
viewId(0) viewId(0)
{ {
if (uniqueId > s_maxViewId) { if (uniqueId > s_maxViewId) {
@ -102,7 +101,6 @@ public:
Plasma::Containment *containment; Plasma::Containment *containment;
bool drawWallpaper; bool drawWallpaper;
bool trackChanges; bool trackChanges;
int desktop;
int viewId; int viewId;
static int s_maxViewId; static int s_maxViewId;
}; };
@ -155,8 +153,6 @@ void View::setScreen(int screen, int desktop)
desktop = -1; desktop = -1;
} }
d->desktop = desktop;
Containment *containment = corona->containmentForScreen(screen, desktop); Containment *containment = corona->containmentForScreen(screen, desktop);
if (containment) { if (containment) {
d->containment = 0; //so that we don't end up on the old containment's screen d->containment = 0; //so that we don't end up on the old containment's screen
@ -176,12 +172,17 @@ int View::screen() const
int View::desktop() const int View::desktop() const
{ {
return d->desktop; if (d->containment) {
return d->containment->desktop();
}
return -2;
} }
int View::effectiveDesktop() const int View::effectiveDesktop() const
{ {
return d->desktop > -1 ? d->desktop : KWindowSystem::currentDesktop(); int desk = desktop();
return desk > -1 ? desk : KWindowSystem::currentDesktop();
} }
void View::setContainment(Plasma::Containment *containment) void View::setContainment(Plasma::Containment *containment)
@ -204,8 +205,10 @@ void View::setContainment(Plasma::Containment *containment)
Containment *oldContainment = d->containment; Containment *oldContainment = d->containment;
int screen = -1; int screen = -1;
int desktop = -1;
if (oldContainment) { if (oldContainment) {
screen = d->containment->screen(); screen = d->containment->screen();
desktop = d->containment->desktop();
} else { } else {
setScene(containment->scene()); setScene(containment->scene());
} }
@ -216,13 +219,15 @@ void View::setContainment(Plasma::Containment *containment)
d->containment->addAssociatedWidget(this); d->containment->addAssociatedWidget(this);
int otherScreen = containment->screen(); int otherScreen = containment->screen();
int otherDesktop = containment->desktop();
if (screen > -1) { if (screen > -1) {
containment->setScreen(screen); containment->setScreen(screen, desktop);
} }
if (oldContainment && otherScreen > -1) { if (oldContainment && otherScreen > -1) {
oldContainment->setScreen(otherScreen); // assign the old containment the old screen/desktop
oldContainment->setScreen(otherScreen, otherDesktop);
} }
/* /*
@ -232,12 +237,6 @@ void View::setContainment(Plasma::Containment *containment)
} }
*/ */
if (containment->screen() > -1 && d->desktop < -1) {
// we want to set it to "all desktops" if we get ownership of
// a screen but don't have a desktop explicitly set
d->desktop = -1;
}
d->updateSceneRect(); d->updateSceneRect();
connect(containment, SIGNAL(destroyed(QObject*)), this, SLOT(containmentDestroyed())); connect(containment, SIGNAL(destroyed(QObject*)), this, SLOT(containmentDestroyed()));
connect(containment, SIGNAL(geometryChanged()), this, SLOT(updateSceneRect())); connect(containment, SIGNAL(geometryChanged()), this, SLOT(updateSceneRect()));