diff options
Diffstat (limited to 'src/modules/objects/KvsObject_widget.cpp')
| -rw-r--r-- | src/modules/objects/KvsObject_widget.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp index 5c8333665..73babf97a 100644 --- a/src/modules/objects/KvsObject_widget.cpp +++ b/src/modules/objects/KvsObject_widget.cpp @@ -896,7 +896,7 @@ bool KvsObject_widget::eventFilter(QObject *o,QEvent *e) lParams.append(new KviKvsVariant((kvs_int_t)aparam)); lParams.append(new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().x())); lParams.append(new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().y())); - if (!callFunction(this,"mousePressEvent",0,&lParams)) brokenhandler = true; // ignore results of a broken event handler + if (!callFunction(this,"mousePressEvent",&oReturnBuffer,&lParams)) brokenhandler = true; // ignore results of a broken event handler } break; case QEvent::MouseButtonRelease: @@ -910,7 +910,7 @@ bool KvsObject_widget::eventFilter(QObject *o,QEvent *e) lParams.append(new KviKvsVariant((kvs_int_t)aparam)); lParams.append(new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().x())); lParams.append(new KviKvsVariant((kvs_int_t)((QMouseEvent *)e)->pos().y())); - if (!callFunction(this,"mouseReleaseEvent",0,&lParams)) brokenhandler = true; // ignore results of a broken event handler + if (!callFunction(this,"mouseReleaseEvent",&oReturnBuffer,&lParams)) brokenhandler = true; // ignore results of a broken event handler } break; case QEvent::MouseButtonDblClick: @@ -979,13 +979,22 @@ bool KvsObject_widget::eventFilter(QObject *o,QEvent *e) break; } - if (!brokenhandler) + if (!brokenhandler){ ret = oReturnBuffer.asBoolean(); + //qDebug ("Propagation %i",ret); return ret; + } + } + /*if(o->parent()) + { + qDebug("Propagation to parent"); + return KviKvsObject::eventFilter(o->parent(),e); } - - return KviKvsObject::eventFilter(o,e); + else{ + qDebug("Propagation to object");*/ + return KviKvsObject::eventFilter(o,e); + // } } |