solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix wxEVT_SET_CURSOR handling under wxQt

Browse source 
Really fix wxSetCursorEvent handling for wxAUI done in commit f608b34
(Send set cursor events whenever there is mouse movement) without
breaking the other controls, i.e. wxSplitterWindow, wxHeaderCtrl and
wxGrid.

Pass the mouse position by const reference to QtSendSetCursorEvent().

Closes #24217.
This commit is contained in:
ali kettab 2024-01-14 23:23:27 +01:00 • committed by Vadim Zeitlin
parent 38d8980283
commit 152ec01122
2 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/wx/qt/window.h
View file

@ -167,7 +167,7 @@ public:
static void QtStoreWindowPointer( QWidget *widget, const wxWindowQt *window );
static wxWindowQt *QtRetrieveWindowPointer( const QWidget *widget );
static void QtSendSetCursorEvent(wxWindowQt* win, wxPoint posClient);
static void QtSendSetCursorEvent(wxWindowQt* win, const wxPoint& posClient);
#if wxUSE_ACCEL
virtual void QtHandleShortcut ( int command );

34
src/qt/window.cpp
View file

@ -271,27 +271,33 @@ static const char WINDOW_POINTER_PROPERTY_NAME[] = "wxWindowPointer";
}
/* static */
void wxWindowQt::QtSendSetCursorEvent(wxWindowQt* win, wxPoint posScreen)
void wxWindowQt::QtSendSetCursorEvent(wxWindowQt* win, const wxPoint& posClient)
{
wxWindowQt* w = win;
for ( ;; )
{
const wxPoint posClient = w->ScreenToClient(posScreen);
wxSetCursorEvent event(posClient.x, posClient.y);
event.SetEventObject(w);
const wxRect rect(win->GetClientAreaOrigin(), win->GetClientSize());
const bool processedEvtSetCursor = w->ProcessWindowEvent(event);
if ( rect.Contains(posClient) )
{
wxSetCursorEvent event( posClient.x , posClient.y );
event.SetId(win->GetId());
event.SetEventObject(win);
const bool processedEvtSetCursor = win->HandleWindowEvent(event);
if ( processedEvtSetCursor && event.HasCursor() )
{
win->SetCursor(event.GetCursor());
return;
}
else
{
// Notice that GetCursor() can return an invalid cursor even if the window already
// has a valid cursor set at the Qt level. Don't override it if this is the case.
const bool hasCursor = win->GetHandle()->testAttribute(Qt::WA_SetCursor);
w = w->GetParent();
if ( w == nullptr )
break;
if ( !hasCursor || (!wxIsBusy() && !win->GetParent()) )
{
win->SetCursor( *wxSTANDARD_CURSOR );
}
}
}
win->SetCursor(wxCursor(wxCURSOR_ARROW));
}
static wxWindowQt *s_capturedWindow = nullptr;
@ -1686,7 +1692,7 @@ bool wxWindowQt::QtHandleMouseEvent ( QWidget *handler, QMouseEvent *event )
ProcessWindowEvent( e );
}
QtSendSetCursorEvent(this, wxQtConvertPoint( event->globalPos()));
QtSendSetCursorEvent(this, mousePos);
}
m_mouseInside = mouseInside;