AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-16 07:04:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'gdk-win32-modal-handling' into 'main'

Browse Source 
GdkWin32: Do not use MA_NOACTIVATEANDEAT

Closes #5297 and #5326

See merge request GNOME/gtk!5208
This commit is contained in:
Luca Bacci 2022-12-14 10:08:42 +00:00
commit 0bdf30dfbf
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gdk/win32/gdkevents-win32.c
View File

@ -2731,22 +2731,15 @@ gdk_event_translate (MSG *msg,
} }
break; break;
case WM_MOUSEACTIVATE: case WM_MOUSEACTIVATE:
{ if (GDK_IS_DRAG_SURFACE (window) ||
if (GDK_IS_DRAG_SURFACE (window)) _gdk_modal_blocked (window))
{ {
*ret_valp = MA_NOACTIVATE; *ret_valp = MA_NOACTIVATE;
return_val = TRUE; return_val = TRUE;
} }
if (_gdk_modal_blocked (window)) break;
{
*ret_valp = MA_NOACTIVATEANDEAT;
return_val = TRUE;
}
}
break;
case WM_POINTERACTIVATE: case WM_POINTERACTIVATE:
if (GDK_IS_DRAG_SURFACE (window) || if (GDK_IS_DRAG_SURFACE (window) ||