Refactor macOS coordinate conversions to utility header

Moved coordinate system conversion helpers to a new coordinate_utils_macos.h file for reuse. Updated display, display_manager, and window implementations to use these utilities, improving consistency and maintainability of coordinate conversions between top-left and bottom-left origins.

Author: lijy91

src/platform/macos/coordinate_utils_macos.h

@@ -0,0 +1,41 @@
+#pragma once
+
+// Import Cocoa and Core Graphics headers
+#import <Cocoa/Cocoa.h>
+#import <CoreGraphics/CoreGraphics.h>
+
+namespace nativeapi {
+
+// NSRect extension-like helper for coordinate system conversion
+struct NSRectExt {
+  // Convert NSRect with bottom-left origin to topLeft point
+  static CGPoint topLeft(NSRect rect) {
+    NSRect primaryScreenFrame = [[NSScreen screens][0] frame];
+    return CGPointMake(rect.origin.x,
+                       primaryScreenFrame.size.height - rect.origin.y - rect.size.height);
+  }
+
+  // Convert NSRect with topLeft origin to NSRect with bottom-left origin
+  static NSRect bottomLeft(NSRect rect) {
+    NSRect primaryScreenFrame = [[NSScreen screens][0] frame];
+    // Convert topLeft origin to bottom-left origin
+    double bottomY = primaryScreenFrame.size.height - rect.origin.y - rect.size.height;
+    return NSMakeRect(rect.origin.x, bottomY, rect.size.width, rect.size.height);
+  }
+};
+
+// NSPoint extension-like helper for coordinate system conversion
+struct NSPointExt {
+  static CGPoint topLeft(NSPoint point) {
+    NSRect primaryScreenFrame = [[NSScreen screens][0] frame];
+    return CGPointMake(point.x, primaryScreenFrame.size.height - point.y);
+  }
+
+  // Convert from top-left coordinate system to bottom-left (macOS default)
+  static NSPoint bottomLeft(CGPoint topLeftPoint) {
+    NSRect primaryScreenFrame = [[NSScreen screens][0] frame];
+    return NSMakePoint(topLeftPoint.x, primaryScreenFrame.size.height - topLeftPoint.y);
+  }
+};
+
+}  // namespace nativeapi

src/platform/macos/display_macos.mm

@@ -1,20 +1,12 @@
 #include "../../display.h"
+#include "coordinate_utils_macos.h"
 
 // Import Cocoa and Core Graphics headers
 #import <Cocoa/Cocoa.h>
 #import <CoreGraphics/CoreGraphics.h>
 
 namespace nativeapi {
 
-// NSRect extension-like helper for coordinate system conversion
-struct NSRectExt {
-  static CGPoint topLeft(NSRect rect) {
-    NSRect primaryScreenFrame = [[NSScreen screens][0] frame];
-    return CGPointMake(rect.origin.x,
-                       primaryScreenFrame.size.height - rect.origin.y - rect.size.height);
-  }
-};
-
 // Private implementation class
 class Display::Impl {
  public:

src/platform/macos/display_manager_macos.mm

@@ -6,6 +6,7 @@
 
 #include "../../display.h"
 #include "../../display_manager.h"
+#include "coordinate_utils_macos.h"
 
 // Import Cocoa and Core Graphics headers
 #import <Cocoa/Cocoa.h>
@@ -80,9 +81,13 @@ static Display CreateDisplayFromNSScreen(NSScreen* screen, bool isPrimary) {
 
 Point DisplayManager::GetCursorPosition() {
   NSPoint mouseLocation = [NSEvent mouseLocation];
+  
+  // Convert from bottom-left (macOS default) to top-left coordinate system
+  CGPoint topLeftPoint = NSPointExt::topLeft(mouseLocation);
+  
   Point point;
-  point.x = mouseLocation.x;
-  point.y = mouseLocation.y;
+  point.x = topLeftPoint.x;
+  point.y = topLeftPoint.y;
   return point;
 }
 

src/platform/macos/window_macos.mm

@@ -1,6 +1,7 @@
 #include <iostream>
 #include "../../window.h"
 #include "../../window_manager.h"
+#include "coordinate_utils_macos.h"
 
 // Import Cocoa headers
 #import <Cocoa/Cocoa.h>
@@ -107,15 +108,18 @@
 //// Color Window::GetBackgroundColor() const;
 
 void Window::SetBounds(Rectangle bounds) {
-  [pimpl_->ns_window_ setFrame:NSMakeRect(bounds.x, bounds.y, bounds.width, bounds.height)
-                       display:YES];
+  // Convert from topLeft coordinate system to bottom-left (macOS default)
+  NSRect topLeftRect = NSMakeRect(bounds.x, bounds.y, bounds.width, bounds.height);
+  NSRect nsRect = NSRectExt::bottomLeft(topLeftRect);
+  [pimpl_->ns_window_ setFrame:nsRect display:YES];
 }
 
 Rectangle Window::GetBounds() const {
   NSRect frame = [pimpl_->ns_window_ frame];
-  Rectangle bounds = {static_cast<double>(frame.origin.x), static_cast<double>(frame.origin.y),
-                      static_cast<double>(frame.size.height),
-                      static_cast<double>(frame.size.width)};
+  // Convert from bottom-left (macOS default) to top-left coordinate system
+  CGPoint topLeft = NSRectExt::topLeft(frame);
+  Rectangle bounds = {topLeft.x, topLeft.y, static_cast<double>(frame.size.width),
+                      static_cast<double>(frame.size.height)};
   return bounds;
 }
 
@@ -246,16 +250,17 @@
 }
 
 void Window::SetPosition(Point point) {
-  NSRect screenFrameRect = [[NSScreen screens][0] frame];
-  // Convert point to bottom left origin
-  NSPoint bottomLeft =
-      NSMakePoint(point.x, screenFrameRect.size.height - point.y - GetSize().height);
+  // Convert from topLeft coordinate system to bottom-left (macOS default)
+  NSPoint topLeftPoint = {point.x, point.y};
+  NSPoint bottomLeft = NSPointExt::bottomLeft(topLeftPoint);
   [pimpl_->ns_window_ setFrameOrigin:bottomLeft];
 }
 
 Point Window::GetPosition() const {
   NSRect frame = [pimpl_->ns_window_ frame];
-  Point point = {static_cast<double>(frame.origin.x), static_cast<double>(frame.origin.y)};
+  // Convert from bottom-left (macOS default) to top-left coordinate system
+  CGPoint topLeft = NSRectExt::topLeft(frame);
+  Point point = {topLeft.x, topLeft.y};
   return point;
 }