Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxFindWindowAtPoint() for hit testing in wxPopupTransientWindow.

Browse Source 
This works even with irregularly shaped windows such as wxRichToolTip unlike
the old naive test using wxRect::Contains() which didn't and resulted in us
believing that the mouse was outside the window when it was still in it and
(somehow, the details are not totally clear) recapturing the mouse again and
again in the same window which resulted in assert failures with the new checks
in wxWindowBase::CaptureMouse() or the capture stack corruption before this.

Closes #15288.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-08-18 13:28:23 +00:00
parent bf2c43c76e
commit 5f9e369af0
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/common/popupcmn.cpp
View File

@@ -449,21 +449,31 @@ void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
if (IsShown() && m_child)
{
wxPoint pos = ScreenToClient(wxGetMousePosition());
wxRect rect(GetSize());
// Store the last mouse position to minimize the number of calls to
// wxFindWindowAtPoint() which are quite expensive.
static wxPoint s_posLast;
const wxPoint pos = wxGetMousePosition();
if ( pos != s_posLast )
{
s_posLast = pos;
if ( rect.Contains(pos) )
{
if ( m_child->HasCapture() )
wxWindow* const winUnderMouse = wxFindWindowAtPoint(pos);
// We release the mouse capture while the mouse is inside the popup
// itself to allow using it normally with the controls inside it.
if ( wxGetTopLevelParent(winUnderMouse) == this )
{
m_child->ReleaseMouse();
if ( m_child->HasCapture() )
{
m_child->ReleaseMouse();
}
}
}
else
{
if ( !m_child->HasCapture() )
else // And we reacquire it as soon as the mouse goes outside.
{
m_child->CaptureMouse();
if ( !m_child->HasCapture() )
{
m_child->CaptureMouse();
}
}
}
}