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

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

View File

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