diff --git a/src/Platform.h b/src/Platform.h index ac708bd9..300ab4f1 100644 --- a/src/Platform.h +++ b/src/Platform.h @@ -58,6 +58,9 @@ public: /// @brief Returns the window at the specified global coordinates virtual std::shared_ptr windowAt(QPoint globalPos) const = 0; + /// @brief Sends the specified event to the specified view + virtual void sendEvent(View *, QEvent *) const = 0; + #ifdef DOCKS_DEVELOPER_MODE /// @brief Waits for the specified window to be active (have the keyboard focus) /// Window::isActive() should return true @@ -78,7 +81,6 @@ public: /// @brief Waits for the specified view to be deleted virtual bool tests_waitForDeleted(View *, int timeout = 2000) const = 0; - virtual void tests_sendEvent(View *, QEvent *) const = 0; virtual void tests_sendEvent(std::shared_ptr window, QEvent *ev) const = 0; /// @brief Implement any needed initializations before tests starting to run, if any diff --git a/src/qtcommon/Platform_qt.cpp b/src/qtcommon/Platform_qt.cpp index d704f573..50a868ae 100644 --- a/src/qtcommon/Platform_qt.cpp +++ b/src/qtcommon/Platform_qt.cpp @@ -147,7 +147,7 @@ bool Platform_qt::tests_waitForDeleted(View *view, int timeout) const return wasDeleted; } -void Platform_qt::tests_sendEvent(View *view, QEvent *ev) const +void Platform_qt::sendEvent(View *view, QEvent *ev) const { qApp->sendEvent(view->asQObject(), ev); } diff --git a/src/qtcommon/Platform_qt.h b/src/qtcommon/Platform_qt.h index 99e3856c..d4c01b18 100644 --- a/src/qtcommon/Platform_qt.h +++ b/src/qtcommon/Platform_qt.h @@ -30,6 +30,8 @@ public: std::shared_ptr qobjectAsWindow(QObject *) const override; virtual std::shared_ptr windowFromQWindow(QWindow *) const = 0; + void sendEvent(View *, QEvent *) const override; + #ifdef DOCKS_DEVELOPER_MODE bool tests_waitForWindowActive(std::shared_ptr, int timeout = 5000) const override; bool tests_waitForEvent(QObject *w, QEvent::Type type, int timeout = 5000) const override; @@ -39,7 +41,6 @@ public: bool tests_waitForResize(Controller *, int timeout = 2000) const override; bool tests_waitForDeleted(View *, int timeout = 2000) const override; void tests_sendEvent(std::shared_ptr, QEvent *) const override; - void tests_sendEvent(View *, QEvent *) const override; void tests_initTests() const override; #endif }; diff --git a/tests/utils.cpp b/tests/utils.cpp index 8290642d..9548dfde 100644 --- a/tests/utils.cpp +++ b/tests/utils.cpp @@ -202,7 +202,7 @@ void KDDockWidgets::Tests::doubleClickOn(QPoint globalPos, View *receiver) qApp->sendEvent(actualReceiver, &ev); } else { // QtWidgets case - Platform::instance()->tests_sendEvent(receiver, &ev); + Platform::instance()->sendEvent(receiver, &ev); } } @@ -221,7 +221,7 @@ void KDDockWidgets::Tests::pressOn(QPoint globalPos, View *receiver) QCursor::setPos(globalPos); QMouseEvent ev(QEvent::MouseButtonPress, receiver->mapFromGlobal(globalPos), receiver->window()->mapFromGlobal(globalPos), globalPos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); - Platform::instance()->tests_sendEvent(receiver, &ev); + Platform::instance()->sendEvent(receiver, &ev); } void KDDockWidgets::Tests::pressOn(QPoint globalPos, Window::Ptr receiver) @@ -236,7 +236,7 @@ void KDDockWidgets::Tests::releaseOn(QPoint globalPos, View *receiver) { QMouseEvent ev(QEvent::MouseButtonRelease, receiver->mapFromGlobal(globalPos), receiver->window()->mapFromGlobal(globalPos), globalPos, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier); - Platform::instance()->tests_sendEvent(receiver, &ev); + Platform::instance()->sendEvent(receiver, &ev); } void KDDockWidgets::Tests::clickOn(QPoint globalPos, View *receiver) @@ -271,7 +271,7 @@ void KDDockWidgets::Tests::moveMouseTo(QPoint globalDest, View *receiver) return; } - Platform::instance()->tests_sendEvent(receiver, &ev); + Platform::instance()->sendEvent(receiver, &ev); QTest::qWait(2); } }