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

allow click-throughs for the containment's graphicsitems

Browse Source 
this makes folderview happier, yay

svn path=/trunk/KDE/kdelibs/; revision=1017491
This commit is contained in:
Chani Armitage 2009-08-30 18:52:05 +00:00
parent f725121a2a
commit 93aead97a1
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
containment.cpp
View File

@ -519,8 +519,7 @@ void Containment::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
void Containment::mousePressEvent(QGraphicsSceneMouseEvent *event)
{
event->ignore();
QGraphicsItem *item = scene()->itemAt(event->scenePos());
if (item != this) {
if (d->appletAt(event->scenePos())) {
return; //no unexpected click-throughs
}
@ -547,8 +546,7 @@ void Containment::mousePressEvent(QGraphicsSceneMouseEvent *event)
void Containment::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{
event->ignore();
QGraphicsItem *item = scene()->itemAt(event->scenePos());
if (item != this) {
if (d->appletAt(event->scenePos())) {
return; //no unexpected click-throughs
}
@ -691,7 +689,7 @@ void ContainmentPrivate::appletActions(KMenu &desktopMenu, Applet *applet, bool
}
}
bool ContainmentPrivate::showContextMenu(const QPointF &point, const QPoint &screenPos, bool includeApplet)
Applet* ContainmentPrivate::appletAt(const QPointF &point)
{
Applet *applet = 0;
@ -703,17 +701,22 @@ bool ContainmentPrivate::showContextMenu(const QPointF &point, const QPoint &scr
//FIXME what if it's a handle?
while (item) {
if (item->isWidget()) {
applet = qobject_cast<Applet*>(static_cast<QGrahpicsWidget*>(item));
applet = qobject_cast<Applet*>(static_cast<QGraphicsWidget*>(item));
if (applet) {
if (applet->isContainment()) {
applet = 0;
}
break;
}
item = item->parentItem();
}
item = item->parentItem();
}
return applet;
}
bool ContainmentPrivate::showContextMenu(const QPointF &point, const QPoint &screenPos, bool includeApplet)
{
Applet *applet = appletAt(point);
KMenu desktopMenu;
//kDebug() << "context menu event " << (QObject*)applet;
@ -1414,8 +1417,7 @@ void Containment::keyPressEvent(QKeyEvent *event)
void Containment::wheelEvent(QGraphicsSceneWheelEvent *event)
{
event->ignore();
QGraphicsItem *item = scene()->itemAt(event->scenePos());
if (item != this) {
if (d->appletAt(event->scenePos())) {
return; //no unexpected click-throughs
}

2
private/containment_p.h
View File

@ -122,6 +122,8 @@ public:
*/
bool prepareContainmentActions(const QString &trigger, const QPoint &screenPos);
Applet *appletAt(const QPointF &point);
Containment *q;
FormFactor formFactor;
Location location;