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

* immutability is handled by the applet

Browse Source 
* Applet::isImmutable already checks for Corona immutability
* vertical means y, not x ..*sigh*

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=758173
This commit is contained in:
Aaron J. Seigo 2008-01-07 03:56:46 +00:00
parent 500e305b65
commit 033f1f52b3
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
containment.cpp
View File

@ -59,7 +59,6 @@ public:
formFactor(Planar), formFactor(Planar),
location(Floating), location(Floating),
screen(-1), screen(-1),
immutable(false),
toolbox(0), toolbox(0),
type(Containment::NoContainmentType) type(Containment::NoContainmentType)
{ {
@ -87,7 +86,6 @@ public:
Applet::List applets; Applet::List applets;
QMap<Applet*, AppletHandle*> handles; QMap<Applet*, AppletHandle*> handles;
int screen; int screen;
bool immutable;
DesktopToolbox *toolbox; DesktopToolbox *toolbox;
Containment::Type type; Containment::Type type;
}; };
@ -677,7 +675,7 @@ void Containment::setScreen(int screen)
//kDebug() << "we are a panel on" << r << ", let's move ourselves to a negative coordinate system" << -(r.x() * 2) - r.height() - INTER_CONTAINMENT_MARGIN; //kDebug() << "we are a panel on" << r << ", let's move ourselves to a negative coordinate system" << -(r.x() * 2) - r.height() - INTER_CONTAINMENT_MARGIN;
// panels are moved into negative coords; we double the x() so that each screen get's // panels are moved into negative coords; we double the x() so that each screen get's
// it's own area for panels // it's own area for panels
int vertOffset = (r.x() * 2) + r.height() + INTER_CONTAINMENT_MARGIN; int vertOffset = (r.y() * 2) + r.height() + INTER_CONTAINMENT_MARGIN;
translate(0, -vertOffset); translate(0, -vertOffset);
} }
} }
@ -796,8 +794,8 @@ bool Containment::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
switch (event->type()) { switch (event->type()) {
case QEvent::GraphicsSceneHoverEnter: case QEvent::GraphicsSceneHoverEnter:
//kDebug() << "got hoverenterEvent" << d->immutable << " " << applet->isImmutable(); //kDebug() << "got hoverenterEvent" << isImmutable << " " << applet->isImmutable();
if (!d->immutable && !applet->isImmutable() && !corona()->isImmutable() && !d->handles.contains(applet)) { if (!isImmutable() && !applet->isImmutable() && !d->handles.contains(applet)) {
//kDebug() << "generated applet handle"; //kDebug() << "generated applet handle";
//TODO: there should be a small delay on showing these. they pop up too quickly/easily //TODO: there should be a small delay on showing these. they pop up too quickly/easily
// right now // right now