winemac: Merge RESET_DEVICE_METRICS and DISPLAYCHANGE internal messages.

This commit is contained in:
Rémi Bernon 2024-06-03 10:41:19 +02:00 committed by Alexandre Julliard
parent 7cb0b66eb7
commit d49cf1021b
2 changed files with 1 additions and 6 deletions

View file

@ -95,7 +95,6 @@ static inline RECT rect_from_cgrect(CGRect cgrect)
enum macdrv_window_messages
{
WM_MACDRV_SET_WIN_REGION = WM_WINE_FIRST_DRIVER_MSG,
WM_MACDRV_RESET_DEVICE_METRICS,
WM_MACDRV_DISPLAYCHANGE,
WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS,
};

View file

@ -1586,8 +1586,6 @@ void macdrv_resize_desktop(void)
if (!NtUserGetWindowRect(hwnd, &current_desktop_rect) ||
!CGRectEqualToRect(cgrect_from_rect(current_desktop_rect), new_desktop_rect))
{
send_message_timeout(HWND_BROADCAST, WM_MACDRV_RESET_DEVICE_METRICS, 0, 0,
SMTO_ABORTIFHUNG, 2000, NULL);
NtUserSetWindowPos(hwnd, 0, CGRectGetMinX(new_desktop_rect), CGRectGetMinY(new_desktop_rect),
CGRectGetWidth(new_desktop_rect), CGRectGetHeight(new_desktop_rect),
SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE);
@ -2020,10 +2018,8 @@ LRESULT macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
release_win_data(data);
}
return 0;
case WM_MACDRV_RESET_DEVICE_METRICS:
macdrv_reset_device_metrics();
return 0;
case WM_MACDRV_DISPLAYCHANGE:
macdrv_reset_device_metrics();
macdrv_reassert_window_position(hwnd);
return 0;
case WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS: