From ec2e99ead57bfa81c65f6c8435f20d9fb0ae4fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Mon, 18 Jun 2012 15:53:30 +0200 Subject: Fixed mouse grabbing preventing popups from being closed. The pointer grabbing leads to fake Enter events being sent to the Qt::Popup window, preventing it from closing since QWidget::underMouse() returns true. We should only send Enter events if the mouse is actually inside the widget. Change-Id: I4ba3fb08943580f93ad4337ff0227becd647767e Reviewed-by: Laszlo Agocs Reviewed-by: Lars Knoll --- tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 47 +++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'tests') diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 2de2b1a76f..1dd855b59f 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -68,6 +68,7 @@ #include #include #include +#include #include #include @@ -170,6 +171,7 @@ private slots: void palettePropagation(); void palettePropagation2(); void enabledPropagation(); + void popupEnterLeave(); #ifndef QT_NO_DRAGANDDROP void acceptDropsPropagation(); #endif @@ -4725,6 +4727,51 @@ public: } \ } +void tst_QWidget::popupEnterLeave() +{ + QWidget parent; + parent.setWindowFlags(Qt::FramelessWindowHint); + parent.setGeometry(10, 10, 200, 100); + + ColorWidget alien(&parent, Qt::black); + alien.setGeometry(0, 0, 10, 10); + alien.show(); + + parent.show(); + + QTest::qWaitForWindowShown(parent.windowHandle()); + + QWindowSystemInterface::handleMouseEvent(parent.windowHandle(), QPointF(5, 5), QPointF(), Qt::LeftButton, Qt::NoModifier); + QTest::qWait(100); + QWindowSystemInterface::handleMouseEvent(parent.windowHandle(), QPointF(5, 5), QPointF(), Qt::NoButton, Qt::NoModifier); + QTest::qWait(100); + + QStringList wordList; + wordList << "alpha" << "omega" << "omicron" << "zeta"; + + QLineEdit popup(&parent); + + QCompleter completer(wordList); + completer.setCaseSensitivity(Qt::CaseInsensitive); + popup.setCompleter(&completer); + popup.setWindowFlags(Qt::Popup); + popup.setGeometry(20, 20, 80, 20); + + popup.show(); + + QTest::qWaitForWindowShown(popup.windowHandle()); + + QTest::qWait(100); + + QWindowSystemInterface::handleMouseEvent(popup.windowHandle(), QPointF(-5, -5), QPointF(), Qt::LeftButton, Qt::NoModifier); + QTest::qWait(100); + QWindowSystemInterface::handleMouseEvent(popup.windowHandle(), QPointF(-5, -5), QPointF(), Qt::NoButton, Qt::NoModifier); + QTest::qWait(100); + + QTest::qWait(1000); + QVERIFY(!popup.underMouse()); +} + void tst_QWidget::moveChild_data() { QTest::addColumn("offset"); -- cgit v1.2.3