winemac: Send WM_{ENTER, EXIT}SIZEMOVE around window frame changes initiated by Cocoa.

The Mac driver was already sending these events when the user resizes the window by dragging its corner/edges, but there are other occasions when the window frame changes. For example, when the user zooms the window.

winemac: Send WM_{ENTER, EXIT}SIZEMOVE around window frame changes initiated by Cocoa.
de3fb34a · Ken Thomases · Alexandre Julliard · b11d6850 · de3fb34a · de3fb34a
Commit de3fb34a authored Oct 31, 2013 by Ken Thomases Committed by Alexandre Julliard Nov 01, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

cocoa_window.m dlls/winemac.drv/cocoa_window.m +1 -0

macdrv_cocoa.h dlls/winemac.drv/macdrv_cocoa.h +1 -0

window.c dlls/winemac.drv/window.c +6 -0

No files found.
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -1718,6 +1718,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif
        event = macdrv_create_event(WINDOW_FRAME_CHANGED, self);
        event->window_frame_changed.frame = NSRectToCGRect(frame);
        event->window_frame_changed.fullscreen = ([self styleMask] & NSFullScreenWindowMask) != 0;
+        event->window_frame_changed.in_resize = [self inLiveResize];
        [queue postEvent:event];
        macdrv_release_event(event);


--- a/dlls/winemac.drv/macdrv_cocoa.h
+++ b/dlls/winemac.drv/macdrv_cocoa.h
@@ -275,6 +275,7 @@ typedef struct macdrv_event {
        struct {
            CGRect  frame;
            int     fullscreen;
+            int     in_resize;
        }                                           window_frame_changed;
        struct {
            unsigned long   serial;

--- a/dlls/winemac.drv/window.c
+++ b/dlls/winemac.drv/window.c
@@ -1718,7 +1718,13 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event)
    if (event->window_frame_changed.fullscreen)
        flags |= SWP_NOSENDCHANGING;
    if (!(flags & SWP_NOSIZE) || !(flags & SWP_NOMOVE))
+    {
+        if (!event->window_frame_changed.in_resize)
+            SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0);
        SetWindowPos(hwnd, 0, rect.left, rect.top, width, height, flags);
+        if (!event->window_frame_changed.in_resize)
+            SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0);
+    }
 }