fix(mac): Revert MacOS mouse position change

Author: SpaghettDev

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v4.2.0-beta.13] - 2025-01-01
+
+### Changed
+
+- Target Geode version (v4.0.1 -> v4.1.2)
+
+### Fixed
+
+- Unable to click on input on MacOS
+
 ## [v4.2.0-beta.12] - 2024-12-04
 
 ### Added

mod.json

@@ -1,10 +1,10 @@
 {
-    "geode": "4.0.1",
+    "geode": "4.1.2",
     "gd": {
         "win": "2.2074",
         "mac": "2.2074"
     },
-    "version": "v4.2.0-beta.12",
+    "version": "v4.2.0-beta.13",
     "id": "spaghettdev.betterinputs",
     "name": "BetterInputs",
     "developer": "SpaghettDev",

src/macos.mm

@@ -37,16 +37,17 @@ inline bool keyDown(PlatformKey key, NSEvent* event)
 
 	namespace cocos
 	{
-		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];
-
-			return ccp(mouse.x - windowFrame.origin.x, winSize.height - (mouse.y - windowFrame.origin.y)) * scaleFactor;
-		}
+		// TODO: fix
+		// 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];
+
+		// 	return ccp(mouse.x - windowFrame.origin.x, winSize.height - (mouse.y - windowFrame.origin.y)) * scaleFactor;
+		// }
 	}
 }
 

src/utils.hpp

@@ -99,18 +99,20 @@ namespace BI
 
 	namespace cocos
 	{
-#ifdef GEODE_IS_WINDOWS
 		inline cocos2d::CCPoint getMousePosition()
 		{
+#ifdef GEODE_IS_WINDOWS
 			auto* director = cocos2d::CCDirector::sharedDirector();
 			auto* gl = director->getOpenGLView();
 			auto winSize = director->getWinSize();
 			auto frameSize = gl->getFrameSize();
 			auto mouse = gl->getMousePosition() / frameSize;
 
 			return cocos2d::CCPoint{ mouse.x, 1.f - mouse.y } * winSize;
-		}
+#elif defined(GEODE_IS_MACOS)
+			return geode::cocos::getMousePos();
 #endif
+		}
 
 		inline bool isPositionInNode(cocos2d::CCNode* node, const cocos2d::CCPoint& pos)
 		{