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

cache the last screen/desktop setting so during moments of transience views don't behave amnesiatically; hopefully fixes the multi-screen containment-switcharoo problem

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=897859
This commit is contained in:
Aaron J. Seigo 2008-12-17 00:40:42 +00:00
parent 60a42ae854
commit c26e118bbf
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
view.cpp
View File

@ -40,7 +40,9 @@ public:
containment(0), containment(0),
drawWallpaper(true), drawWallpaper(true),
trackChanges(true), trackChanges(true),
viewId(0) viewId(0),
lastScreen(-1),
lastDesktop(-2)
{ {
if (uniqueId > s_maxViewId) { if (uniqueId > s_maxViewId) {
s_maxViewId = uniqueId; s_maxViewId = uniqueId;
@ -102,6 +104,8 @@ public:
bool drawWallpaper; bool drawWallpaper;
bool trackChanges; bool trackChanges;
int viewId; int viewId;
int lastScreen;
int lastDesktop;
static int s_maxViewId; static int s_maxViewId;
}; };
@ -167,7 +171,7 @@ int View::screen() const
return d->containment->screen(); return d->containment->screen();
} }
return -1; return d->lastScreen;
} }
int View::desktop() const int View::desktop() const
@ -176,7 +180,7 @@ int View::desktop() const
return d->containment->desktop(); return d->containment->desktop();
} }
return -2; return d->lastDesktop;
} }
int View::effectiveDesktop() const int View::effectiveDesktop() const
@ -230,6 +234,9 @@ void View::setContainment(Plasma::Containment *containment)
oldContainment->setScreen(otherScreen, otherDesktop); oldContainment->setScreen(otherScreen, otherDesktop);
} }
d->lastScreen = screen;
d->lastDesktop = desktop;
/* /*
if (oldContainment) { if (oldContainment) {
kDebug() << (QObject*)oldContainment << screen << oldContainment->screen() kDebug() << (QObject*)oldContainment << screen << oldContainment->screen()