macOS/iOS (#30)

Author: hiimjasmine00

CMakeLists.txt

@@ -18,7 +18,7 @@ endif()
 
 add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)
 
-CPMAddPackage("gh:camila314/uibuilder#3d10e3d")
+CPMAddPackage("gh:camila314/uibuilder#04d0075")
 add_subdirectory(nodes)
 
 if (WIN32)
@@ -32,8 +32,7 @@ endif()
 
 add_subdirectory(run-info)
 
-# TODO: macos still sucks
-if (NOT APPLE)
+# if (NOT APPLE)
 
 add_subdirectory(scroll-zoom)
 
@@ -43,4 +42,4 @@ add_subdirectory(reference-image)
 # add_subdirectory(song-search)
 add_subdirectory(song-preview)
 
-endif()
+# endif()

circle-tool/about.md renamed to circle-tool/README.md

@@ -25,6 +25,13 @@ class TextInputNode : public cocos2d::CCNode, public TextInputDelegate {
 
 	virtual void textChanged(CCTextInputNode*);
 
+	~TextInputNode() {
+		if (input_node) {
+			input_node->onClickTrackNode(false);
+			input_node->setDelegate(nullptr);
+		}
+	}
+
 	void set_value(const std::string& value);
 	std::string get_value();
 };

draw-divide/about.md renamed to draw-divide/README.md

@@ -6,7 +6,12 @@ using namespace geode::prelude;
 class $modify(EditorUI) {
 	void scrollWheel(float y, float x) override {
 		auto kb = CCDirector::sharedDirector()->getKeyboardDispatcher();
-		if (kb->getControlKeyPressed()) {
+		#ifdef GEODE_IS_MACOS
+		auto control = kb->getControlKeyPressed() || kb->getCommandKeyPressed();
+		#else
+		auto control = kb->getControlKeyPressed();
+		#endif
+		if (control) {
 			auto zoom = m_editorLayer->m_objectLayer->getScale();
 			const float mult = 0.015f * Mod::get()->getSettingValue<double>("zoom-mult");
 			zoom = std::max(0.05, zoom * std::pow(2.7, y * -mult));