Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-10-06 07:00:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-enterleave-test' of github.com:AliKet/wxWidgets

Browse Source 
Fix testing wxEVT_{ENTER,LEAVE}_WINDOW.

See #27138.
This commit is contained in:
Vadim Zeitlin
2026-10-04 17:04:18 +02:00
parent 278397fcf6 b1db90b7b1
commit 7024b7dced
2 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/qt/utils.cpp
+7 -7
View File
@@ -66,14 +66,14 @@ wxMouseState wxGetMouseState()
#endif
wxWindow *wxFindWindowAtPoint(const wxPoint& pt)
wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
{
/* Another option is to use QApplication::topLevelAt()
* but that gives the QWidget so the wxWindow list must
* be traversed comparing with this, or use the pointer from
* a wxQtWidget/wxQtFrame to the window, but they have
* no standard interface to return that. */
return wxGenericFindWindowAtPoint( pt );
if ( QWidget* qtWidget = QApplication::widgetAt( wxQtConvertPoint(pt) ) )
{
return wxWindow::QtRetrieveWindowPointer(qtWidget);
}
return nullptr;
}
bool wxGetKeyState(wxKeyCode key)
tests/events/enterleave.cpp
+38 -3
View File
@@ -41,6 +41,22 @@ TEST_CASE("EnterLeaveEvents", "[wxEvent][enter-leave]")
return;
}
#ifdef __WINDOWS__
if ( wxIsRunningUnderWine() )
{
WARN("Skipping testing wxEVT_{ENTER,LEAVE}_WINDOW known to fail under Wine");
return;
}
#ifdef __WXQT__
if ( IsAutomaticTest() )
{
WARN("Skipping testing wxEVT_{ENTER,LEAVE}_WINDOW known to fail on Windows under GitHub Actions");
return;
}
#endif // __WXQT__
#endif // __WINDOWS__
auto panel = make_unique<wxPanel>(wxTheApp->GetTopWindow(), wxID_ANY);
auto button = new wxButton(panel.get(), wxID_ANY, "button", {50, 50});
auto textctrl = new wxTextCtrl(panel.get(), wxID_ANY, "", {160, 50});
@@ -56,19 +72,35 @@ TEST_CASE("EnterLeaveEvents", "[wxEvent][enter-leave]")
wxUIActionSimulator sim;
wxPoint pos = panel->GetScreenPosition() + panel->GetSize();
sim.MouseMove(pos);
YieldForAWhile();
enter.Clear();
leave.Clear();
// Make sure the mouse is outside the window before starting the tests.
REQUIRE(panel.get() != wxFindWindowAtPoint(pos));
SECTION("Without mouse capture")
{
sim.MouseMove(panel->GetScreenPosition() + wxPoint(5, 5));
pos = panel->GetScreenPosition() + wxPoint(5, 5);
sim.MouseMove(pos);
YieldForAWhile();
REQUIRE(panel.get() == wxFindWindowAtPoint(pos));
CHECK( enter.GetCount() == 1 );
CHECK( leave.GetCount() == 0 );
enter.Clear();
sim.MouseMove(button->GetScreenPosition() + wxPoint(5, 5));
pos = button->GetScreenPosition() + wxPoint(5, 5);
sim.MouseMove(pos);
YieldForAWhile();
REQUIRE(panel.get() != wxFindWindowAtPoint(pos));
// The parent window (panel) should receive wxEVT_LEAVE_WINDOW event
// when mouse enters the child window (button)
CHECK( enter.GetCount() == 0 );
@@ -76,9 +108,12 @@ TEST_CASE("EnterLeaveEvents", "[wxEvent][enter-leave]")
leave.Clear();
sim.MouseMove(panel->GetScreenPosition() + wxPoint(5, 5));
pos = panel->GetScreenPosition() + wxPoint(5, 5);
sim.MouseMove(pos);
YieldForAWhile();
REQUIRE(panel.get() == wxFindWindowAtPoint(pos));
// Now it (panel) should receive wxEVT_ENTER_WINDOW event when
// the mouse leaves the button and enters the panel again.
CHECK( enter.GetCount() == 1 );