1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle return of GetCursorPos window api function

Browse Source 
GetCursorPos api function can return false in some cases.
In those cases no cursor position is returned,
so we ignore it and instead return the last cached position.

Fixes: QTBUG-44692
Change-Id: Ie961fe166ef9f1580bd504a55ddfe431e56b3aed
Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Morteza Jamshidi 2024-09-11 09:20:21 +02:00
parent b429da48be
commit e9662a4b66
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/platforms/windows/qwindowscursor.cpp
View File

@ -523,6 +523,7 @@ CursorHandlePtr QWindowsCursor::standardWindowCursor(Qt::CursorShape shape)
HCURSOR QWindowsCursor::m_overriddenCursor = nullptr;
HCURSOR QWindowsCursor::m_overrideCursor = nullptr;
POINT QWindowsCursor::m_cursorPositionCache = {0,0};
/*!
\brief Return cached pixmap cursor or create new one.
@ -633,8 +634,9 @@ void QWindowsCursor::clearOverrideCursor()
QPoint QWindowsCursor::mousePosition()
{
POINT p;
GetCursorPos(&p);
return QPoint(p.x, p.y);
if (GetCursorPos(&p))
m_cursorPositionCache = p;
return QPoint(m_cursorPositionCache.x, m_cursorPositionCache.y);
}
QWindowsCursor::State QWindowsCursor::cursorState()
@ -658,6 +660,7 @@ QPoint QWindowsCursor::pos() const
void QWindowsCursor::setPos(const QPoint &pos)
{
m_cursorPositionCache = {pos.x(), pos.y()};
SetCursorPos(pos.x() , pos.y());
}

1
src/plugins/platforms/windows/qwindowscursor.h
View File

@ -111,6 +111,7 @@ private:
static HCURSOR m_overriddenCursor;
static HCURSOR m_overrideCursor;
static POINT m_cursorPositionCache;
};
QT_END_NAMESPACE