fix mouse positioning

Author: SpaghettDev

src/macos.mm

@@ -39,13 +39,18 @@ inline bool keyDown(PlatformKey key, NSEvent* event)
 	{
 		inline cocos2d::CCPoint getMousePosition(NSEvent* event)
 		{
-			auto windowFrame = [[event window] frame];
-			auto viewFrame = [[[event window] contentView] frame];
-			auto winSize = cocos2d::CCDirector::get()->getWinSize();
-			auto scaleFactor = cocos2d::CCPoint(winSize) / ccp(viewFrame.size.width, viewFrame.size.height);
-			auto mouse = [event locationInWindow];
+			NSWindow* window = [event window];
+			NSView* contentView = [window contentView];
+			NSPoint mouseInWindow = [event locationInWindow];
+			NSPoint mouseInView = [contentView convertPoint:mouseInWindow fromView:nil];
 
-			return ccp(mouse.x - windowFrame.origin.x, winSize.height - (mouse.y - windowFrame.origin.y)) * scaleFactor;
+			NSRect viewFrame = [contentView frame];
+			cocos2d::CCSize winSize = cocos2d::CCDirector::get()->getWinSize();
+			cocos2d::CCPoint scaleFactor = cocos2d::CCPoint(winSize.width / viewFrame.size.width, winSize.height / viewFrame.size.height);
+
+			CGFloat cocosY = [contentView isFlipped] ? (viewFrame.size.height - mouseInView.y) : mouseInView.y;
+
+			return cocos2d::CCPoint(mouseInView.x * scaleFactor.x, cocosY * scaleFactor.y);
 		}
 	}
 }
@@ -203,17 +208,11 @@ void mouseDownExec(EAGLView* self, SEL sel, NSEvent* event)
 	if (!g_selectedInput)
 		return mouseDownExecOIMP(self, sel, event);
 
-	NSPoint m = [event locationInWindow];
-
-	geode::log::debug("mouse pos is ({}, {})", m.x, m.y);
-
 	cocos2d::CCSize winSize = cocos2d::CCDirector::sharedDirector()->getWinSize();
-	cocos2d::CCPoint mousePos = cocos2d::CCPoint{ static_cast<float>(m.x), static_cast<float>(m.y) };
+	cocos2d::CCPoint mousePos = BI::cocos::getMousePosition(event);
 
-	// NSWindow's mouse origin is the bottom left
-	// CCTouch's mouse origin is top left (because of course it is)
 	cocos2d::CCTouch touch{};
-	touch.setTouchInfo(0, mousePos.x, winSize.height - mousePos.y);
+	touch.setTouchInfo(0, mousePos.x, /* winSize.height - */ mousePos.y);
 
 	g_selectedInput->useUpdateBlinkPos(true);