From: Jean-Baptiste M. <jb...@kd...> - 2012-03-29 03:37:03
|
Git commit 7bd05e4be0ea07823130b61e8cc6720fb7541f1a by Jean-Baptiste Mardelle. Committed on 29/03/2012 at 03:16. Pushed by mardelle into branch 'effectstack'. Fix dragging of effects M +6 -5 src/effectstack/effectstackview2.cpp http://commits.kde.org/kdenlive/7bd05e4be0ea07823130b61e8cc6720fb7541f1a diff --git a/src/effectstack/effectstackview2.cpp b/src/effectstack/effectstackview2.cpp index 55827de..f3b8479 100644 --- a/src/effectstack/effectstackview2.cpp +++ b/src/effectstack/effectstackview2.cpp @@ -270,14 +270,15 @@ bool EffectStackView2::eventFilter( QObject * o, QEvent * e ) m_draggedEffect = qobject_cast<CollapsibleEffect*>(o); if (m_draggedEffect) { QMouseEvent *me = static_cast<QMouseEvent *>(e); - if (me->button() == Qt::LeftButton && (m_draggedEffect->frame->underMouse() || m_draggedEffect->title->underMouse())) + if (me->button() == Qt::LeftButton && (m_draggedEffect->frame->underMouse() || m_draggedEffect->title->underMouse())) { m_clickPoint = me->globalPos(); + } else { m_clickPoint = QPoint(); m_draggedEffect = NULL; } e->accept(); - return false; + return true; } m_draggedGroup = qobject_cast<CollapsibleGroup*>(o); if (m_draggedGroup) { @@ -289,10 +290,10 @@ bool EffectStackView2::eventFilter( QObject * o, QEvent * e ) m_draggedGroup = NULL; } e->accept(); - return false; + return true; } } - if (e->type() == QEvent::MouseMove) { + /*if (e->type() == QEvent::MouseMove) { if (qobject_cast<CollapsibleEffect*>(o)) { QMouseEvent *me = static_cast<QMouseEvent *>(e); if (me->buttons() != Qt::LeftButton) { @@ -304,7 +305,7 @@ bool EffectStackView2::eventFilter( QObject * o, QEvent * e ) return true; } } - } + }*/ return QWidget::eventFilter(o, e); } |