Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-03-23 18:54:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

wxScrolled<>: fix testing mouse position in autoscroll zone

Browse Source 
wxWindow::GetRect() does not always report client coordinates,
so use wxWindow::GetScreenRect() and wxWindow::ClientToScreen()
to test mouse and autoscroll zone with consistent coordinate
system.

Closes #26226.
This commit is contained in:
Bill Su
2026-02-22 11:07:27 -05:00
committed by Vadim Zeitlin
parent 876728f6cd
commit 678382f568
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/generic/scrlwing.cpp
View File

@@ -729,14 +729,17 @@ wxScrollHelperBase::AutoscrollTest(wxPoint clientPt,
wxEventType& evtHorzScroll,
wxEventType& evtVertScroll) const
{
const wxPoint screenPt = m_win->ClientToScreen(clientPt);
// is mouse in autoscroll region?
if ( !m_outerScrollEnabled &&
!m_win->GetRect().Contains(clientPt) )
!m_win->GetScreenRect().Contains(screenPt) )
{
return false;
}
wxRect inner = m_win->GetRect().Deflate(m_innerScrollWidth);
if ( inner.Contains(clientPt) )
const wxRect inner = m_win->GetScreenRect().Deflate(m_innerScrollWidth);
if ( inner.Contains(screenPt) )
{
return false;
}
@@ -744,11 +747,11 @@ wxScrollHelperBase::AutoscrollTest(wxPoint clientPt,
// can window can be scrolled in this direction?
if ( m_win->HasScrollbar(wxHORIZONTAL) )
{
if ( clientPt.x < inner.GetLeft() )
if ( screenPt.x < inner.GetLeft() )
{
evtHorzScroll = wxEVT_SCROLLWIN_LINEUP;
}
else if (clientPt.x >= inner.GetRight() )
else if (screenPt.x >= inner.GetRight() )
{
evtHorzScroll = wxEVT_SCROLLWIN_LINEDOWN;
}
@@ -757,11 +760,11 @@ wxScrollHelperBase::AutoscrollTest(wxPoint clientPt,
// can window can be scrolled in this direction?
if ( m_win->HasScrollbar(wxVERTICAL) )
{
if ( clientPt.y < inner.GetTop() )
if ( screenPt.y < inner.GetTop() )
{
evtVertScroll = wxEVT_SCROLLWIN_LINEUP;
}
else if ( clientPt.y >= inner.GetBottom() )
else if ( screenPt.y >= inner.GetBottom() )
{
evtVertScroll = wxEVT_SCROLLWIN_LINEDOWN;
}