diff options
| -rw-r--r-- | src/compositor/compositor_api/qwaylandsurface.cpp | 3 | ||||
| -rw-r--r-- | src/compositor/compositor_api/qwaylandsurface.h | 6 | ||||
| -rw-r--r-- | tests/auto/compositor/compositor/tst_compositor.cpp | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp index c5462839e..0d4cae642 100644 --- a/src/compositor/compositor_api/qwaylandsurface.cpp +++ b/src/compositor/compositor_api/qwaylandsurface.cpp @@ -708,10 +708,11 @@ bool QWaylandSurface::inputRegionContains(const QPoint &p) const return d->inputRegion.contains(p); } -//TODO: Add appropriate \since version when this is made public. /*! * Returns \c true if the QWaylandSurface's input region contains the point \a position. * Otherwise returns \c false. + * + * \since 5.14 */ bool QWaylandSurface::inputRegionContains(const QPointF &position) const { diff --git a/src/compositor/compositor_api/qwaylandsurface.h b/src/compositor/compositor_api/qwaylandsurface.h index f1a8bad2c..64265617f 100644 --- a/src/compositor/compositor_api/qwaylandsurface.h +++ b/src/compositor/compositor_api/qwaylandsurface.h @@ -131,13 +131,7 @@ public: QWaylandCompositor *compositor() const; bool inputRegionContains(const QPoint &p) const; -private: - // TODO: Making this private now since it's added in a patch release, and we want to ensure - // compatibility with older patch releases. - // This should simply be made public (and the friend removed) in the next minor release. - friend class QWaylandQuickItem; bool inputRegionContains(const QPointF &position) const; -public: Q_INVOKABLE void destroy(); Q_INVOKABLE bool isDestroyed() const; diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp index f4f63228c..7fbe8979b 100644 --- a/tests/auto/compositor/compositor/tst_compositor.cpp +++ b/tests/auto/compositor/compositor/tst_compositor.cpp @@ -909,6 +909,11 @@ void tst_WaylandCompositor::inputRegion() QVERIFY(!waylandSurface->inputRegionContains(QPoint(1, 6))); QVERIFY(!waylandSurface->inputRegionContains(QPoint(4, 2))); + QVERIFY(!waylandSurface->inputRegionContains(QPointF(0.99, 1.99))); + QVERIFY(waylandSurface->inputRegionContains(QPointF(1, 2))); + QVERIFY(waylandSurface->inputRegionContains(QPointF(3.99, 4.99))); + QVERIFY(!waylandSurface->inputRegionContains(QPointF(4, 5))); + // Setting a nullptr input region means we want all events wl_surface_set_input_region(surface, nullptr); wl_surface_commit(surface); |