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

Improve wxEVT_LEAVE_WINDOW generation while mouse is captured with GTK3

Browse source 
Non-integral coordinates and overlay scrollbars can cause the event to be
generated with coordinates that are still inside the window. Avoid this by
ensuring that integral coordinates are outside the window, and ignoring overlay
scrollbars. Also remove gdk_display_flush(), contrary to the very old comment
it does not seem to be necessary. Fixes wxScrolledWindow auto-scrolling.
This commit is contained in:
Paul Cornett 2023-12-28 12:39:41 -08:00
parent fc8a780932
commit ef326106c0
1 changed files with 42 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/gtk/window.cpp
View file

@ -1968,27 +1968,54 @@ gtk_window_motion_notify_callback( GtkWidget * WXUNUSED(widget),
if ( g_captureWindow )
{
// synthesise a mouse enter or leave event if needed
GdkWindow* winUnderMouse =
wx_gdk_device_get_window_at_position(gdk_event->device, nullptr, nullptr);
GdkWindow* winUnderMouse = nullptr;
bool isOut = true;
GdkDisplay* display = winUnderMouse
? gdk_window_get_display(winUnderMouse)
: nullptr;
if ( !display )
display = gdk_display_get_default();
if (gdk_event->x >= 0 && gdk_event->y >= 0)
{
const wxSize size(win->GetClientSize());
if (gdk_event->x < size.x && gdk_event->y < size.y)
{
isOut = false;
winUnderMouse =
wx_gdk_device_get_window_at_position(
gdk_event->device, nullptr, nullptr);
}
}
// This seems to be necessary and actually been added to
// GDK itself in version 2.0.X
gdk_display_flush(display);
const bool hadMouse = g_captureWindowHasMouse;
g_captureWindowHasMouse = false;
bool hasMouse = winUnderMouse == gdk_event->window;
if ( hasMouse != g_captureWindowHasMouse )
if (winUnderMouse == gdk_event->window)
g_captureWindowHasMouse = true;
#ifdef __WXGTK3__
else if (winUnderMouse)
{
// Avoid treating overlay scrollbar as a different window
void* widgetUnderMouse;
gdk_window_get_user_data(winUnderMouse, &widgetUnderMouse);
if (GTK_IS_SCROLLBAR(widgetUnderMouse))
{
GtkWidget* parent = gtk_widget_get_parent(GTK_WIDGET(widgetUnderMouse));
if (parent == win->m_widget && GTK_IS_SCROLLED_WINDOW(parent))
g_captureWindowHasMouse = true;
}
}
#endif
if (g_captureWindowHasMouse != hadMouse)
{
// the mouse changed window
g_captureWindowHasMouse = hasMouse;
wxMouseEvent eventM(g_captureWindowHasMouse ? wxEVT_ENTER_WINDOW
: wxEVT_LEAVE_WINDOW);
if (!g_captureWindowHasMouse && isOut)
{
// Ensure fractional coordinate is outside window when converted to int
if (gdk_event->x < 0)
gdk_event->x = floor(gdk_event->x);
if (gdk_event->y < 0)
gdk_event->y = floor(gdk_event->y);
}
InitMouseEvent(win, eventM, gdk_event);
eventM.SetEventObject(win);
win->GTKProcessEvent(eventM);
@ -2001,10 +2028,9 @@ gtk_window_motion_notify_callback( GtkWidget * WXUNUSED(widget),
// reset the event object and id in case win changed.
event.SetEventObject( win );
event.SetId( win->GetId() );
}
if ( !g_captureWindow )
SendSetCursorEvent(win, event.m_x, event.m_y);
}
bool ret = win->GTKProcessEvent(event);