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

remove desktop from the options; that can be discovered simply by having the View, and it's a desktopy concept anyways so doesn't belong in the lib

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=800662
This commit is contained in:
Aaron J. Seigo 2008-04-24 16:01:09 +00:00
parent 2e695fa1ad
commit 8e8d6ea060
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
applet.cpp
View File

@ -1025,11 +1025,7 @@ void Applet::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QW
View* v = qobject_cast<Plasma::View*>(widget->parent());
if (!v || v->isWallpaperEnabled()) {
Containment::StyleOption coption(*option);
if (v) {
coption.desktop = v->effectiveDesktop();
coption.view = v;
}
coption.view = v;
paintInterface(painter, &coption, QRect(QPoint(0,0), boundingRect().size().toSize()));
}

6
containment.cpp
View File

@ -136,20 +136,20 @@ void Containment::Private::setLockToolText()
Containment::StyleOption::StyleOption()
: QStyleOptionGraphicsItem(),
desktop(-1)
view(0)
{
}
Containment::StyleOption::StyleOption(const Containment::StyleOption & other)
: QStyleOptionGraphicsItem(other),
desktop(other.desktop)
view(other.view)
{
}
Containment::StyleOption::StyleOption(const QStyleOptionGraphicsItem &other)
: QStyleOptionGraphicsItem(other),
desktop(-1)
view(0)
{
}

11
containment.h
View File

@ -74,17 +74,6 @@ class PLASMA_EXPORT Containment : public Applet
explicit StyleOption(const StyleOption &other);
explicit StyleOption(const QStyleOptionGraphicsItem &other);
/**
* The virtual desktop (starting at 0) that is currently
* being rendered. this should be used to determine which
* desktop is being rendered for at the current time
* rather than relying on the concept of "current desktop"
* since a containment may be displayed concurrently on
* more than one desktop with desktop effects such as
* desktop grid.
*/
int desktop;
/**
* The View, if any, that this containment is currently
* being rendered into. Note: this may be NULL, so be