diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-09-11 14:10:51 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-09-11 15:37:50 +0000 |
commit | 47b3b1b10246cad6709c0cd99f02208dbaf6b7c0 (patch) | |
tree | 8c82a376bb3d4ef5bdc9460124e291f0c993447d /tests | |
parent | fae076941bf49f13f5911ced9dd00151b4572212 (diff) |
don't re-deliver events to an item which already filtered
That is, if the filtering parent intercepts an event (returns true
from childMouseEventFilter), it does not also need direct delivery of
the same event.
Change-Id: I24003f72875b309fa10b2d316916c5f86702cb57
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index 0c3e580828..d4b505a74a 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -3139,8 +3139,6 @@ void tst_qquickwindow::testChildMouseEventFilter_data() QTest::addColumn<InputState>("inputState"); QTest::addColumn<DeliveryRecordVector>("expectedDeliveryOrder"); - /* - // (This is an intended behavior change in progress: I24003f72875b309fa10b2d316916c5f86702cb57) QTest::newRow("if filtered and rejected, do not deliver it to the item that filtered it") << QPoint(100, 100) << InputState({ @@ -3159,7 +3157,6 @@ void tst_qquickwindow::testChildMouseEventFilter_data() // DeliveryRecord("r2") // r2 filtered it -> do not deliver << DeliveryRecord("r1") ); - */ QTest::newRow("no filtering, no accepting") << QPoint(100, 100) @@ -3276,7 +3273,7 @@ void tst_qquickwindow::testChildMouseEventFilter_data() << DeliveryRecord("r0", "r2") // << DeliveryRecord("r2" // since it got filtered we don't deliver to r2 << DeliveryRecord("r0", "r1") - << DeliveryRecord("r1") +// << DeliveryRecord("r1") // since it acted as a filter and returned true, we don't deliver to r1 << DeliveryRecord("r0") << DeliveryRecord("root") ); |