macOS: fire EventWindowMove on resizes if position changes (closes #116)

HumbleUI · Aug 21, 2021 · 801b314 · 801b314
1 parent 877ff99
commit 801b314
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/macos/cc/WindowDelegate.mm b/macos/cc/WindowDelegate.mm
@@ -16,12 +16,17 @@ - (WindowDelegate*)initWithWindow:(jwm::WindowMac*)initWindow {
 }
 
 - (void)windowDidMove:(NSNotification *)notification {
-    NSPoint pos = jwm::nsWindowPosition(fWindow->fNSWindow);
-    jwm::JNILocal<jobject> event(fWindow->fEnv, jwm::classes::EventWindowMove::make(fWindow->fEnv, pos.x, pos.y));
-    fWindow->dispatch(event.get());
+    NSPoint origin = fWindow->fNSWindow.frame.origin;
+    if (origin.x != fWindow->fLastPosition.x || origin.y != fWindow->fLastPosition.y) {
+        fWindow->fLastPosition = origin;
+        NSPoint pos = jwm::nsWindowPosition(fWindow->fNSWindow);
+        jwm::JNILocal<jobject> event(fWindow->fEnv, jwm::classes::EventWindowMove::make(fWindow->fEnv, pos.x, pos.y));
+        fWindow->dispatch(event.get());
+    }
 }
 
 - (void)windowDidResize:(NSNotification *)notification {
+    [self windowDidMove:notification];
     const NSRect windowFrame = [fWindow->fNSWindow frame];
     const NSRect contentFrame = [fWindow->fNSWindow.contentView frame];
     CGFloat scale = fWindow->getScale();

diff --git a/macos/cc/WindowMac.hh b/macos/cc/WindowMac.hh
@@ -17,6 +17,7 @@ namespace jwm {
         void close();
 
         NSWindow* fNSWindow = nullptr;
+        NSPoint fLastPosition = {0, 0};
         CVDisplayLinkRef fDisplayLink = 0;
         volatile bool fFrameRequested = false;
         volatile bool fFrameScheduled = false;