diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-02-22 21:15:52 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-25 13:39:38 +0100 |
| commit | 4cc6b22c51a5b42e8a19c7b30475dacb537e02a1 (patch) | |
| tree | 130bc20c64f84d56687eb6245bd875783b98c36c /src/controls/qtmenupopupwindow.cpp | |
| parent | 28b73e87fdaf9738f14c36e62940215658ec01ac (diff) | |
Menu: Enable "click-select-release" behavior
Some limitations in MouseArea force us to abandon the "one mouse area
per menu item" implementation in favor of a menu-wide mouse area,
where we track the position changes to highlight the menu item under
the mouse cursor. This makes possible updating the highlighted menu
item while keeping the mouse pressed.
Also, we need to emit an extra mouse press event, from the menu popup
window, so that the menu mouse area will receive any mouse release
event the user may have triggered. This is because the initial mouse
press event popping up the menu was made in another window, and
MouseArea would only emit 'released' signals if the released button
was already pressed.
Change-Id: Id10dd61fcf9e38ef3d34a61b7172301802e9646c
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/controls/qtmenupopupwindow.cpp')
| -rw-r--r-- | src/controls/qtmenupopupwindow.cpp | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/src/controls/qtmenupopupwindow.cpp b/src/controls/qtmenupopupwindow.cpp index 7825f3bf9..8b3bed45e 100644 --- a/src/controls/qtmenupopupwindow.cpp +++ b/src/controls/qtmenupopupwindow.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE QtMenuPopupWindow::QtMenuPopupWindow(QWindow *parent) : - QQuickWindow(parent), m_pressedInside(true), m_itemAt(0) + QQuickWindow(parent), m_mouseMoved(false), m_itemAt(0) { setFlags(Qt::Popup); setModality(Qt::WindowModal); @@ -111,41 +111,39 @@ void QtMenuPopupWindow::updatePosition() void QtMenuPopupWindow::mouseMoveEvent(QMouseEvent *e) { QRect rect = QRect(QPoint(), size()); - QWindow *parentMenuWindow = /*qobject_cast<QtMenuPopupWindow*>*/(transientParent()); - if (parentMenuWindow && !rect.contains(e->pos())) { - forwardEventToTransientParent(e); - } else { + if (rect.contains(e->pos())) { + m_mouseMoved = true; QQuickWindow::mouseMoveEvent(e); + } else { + forwardEventToTransientParent(e); } } -void QtMenuPopupWindow::mousePressEvent(QMouseEvent *e) -{ - QRect rect = QRect(QPoint(), size()); - m_pressedInside = rect.contains(e->pos()); - if (m_pressedInside) - QQuickWindow::mousePressEvent(e); -} - void QtMenuPopupWindow::mouseReleaseEvent(QMouseEvent *e) { QRect rect = QRect(QPoint(), size()); - if (rect.contains(e->pos())) - QQuickWindow::mouseReleaseEvent(e); - else if (!m_pressedInside) - dismissMenu(); - else + if (rect.contains(e->pos())) { + if (m_mouseMoved) { + QMouseEvent pe = QMouseEvent(QEvent::MouseButtonPress, e->pos(), e->button(), e->buttons(), e->modifiers()); + QQuickWindow::mousePressEvent(&pe); + QQuickWindow::mouseReleaseEvent(e); + } + } else { forwardEventToTransientParent(e); + } } void QtMenuPopupWindow::forwardEventToTransientParent(QMouseEvent *e) { - QWindow *parentMenuWindow = /*qobject_cast<QtMenuPopupWindow*>*/(transientParent()); - if (!parentMenuWindow) - return; - QPoint parentPos = parentMenuWindow->mapFromGlobal(mapToGlobal(e->pos())); - QMouseEvent pe = QMouseEvent(e->type(), parentPos, e->button(), e->buttons(), e->modifiers()); - QGuiApplication::sendEvent(parentMenuWindow, &pe); + QWindow *parentMenuWindow = qobject_cast<QtMenuPopupWindow*>(transientParent()); + if (!parentMenuWindow) { + if (m_mouseMoved && e->type() == QEvent::MouseButtonRelease) + dismissMenu(); + } else { + QPoint parentPos = parentMenuWindow->mapFromGlobal(mapToGlobal(e->pos())); + QMouseEvent pe = QMouseEvent(e->type(), parentPos, e->button(), e->buttons(), e->modifiers()); + QGuiApplication::sendEvent(parentMenuWindow, &pe); + } } QT_END_NAMESPACE |