Merge pull request #13 from undefined06855/main

fix touch priority with Better Touch Prio, among other things

Author: BobbyShmurner

.github/workflows/multi-platform.yml

@@ -3,57 +3,57 @@ name: Build Geode Mod
 on:
   workflow_dispatch:
   push:
-    branches:
-      - "**"
+	branches:
+	  - "**"
 
 jobs:
   build:
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-        - name: Windows
-          os: windows-latest
-
-        - name: macOS
-          os: macos-latest
-
-        - name: iOS
-          os: macos-latest
-          target: iOS
-
-        - name: Android32
-          os: ubuntu-latest
-          target: Android32
-
-        - name: Android64
-          os: ubuntu-latest
-          target: Android64
-
-    name: ${{ matrix.config.name }}
-    runs-on: ${{ matrix.config.os }}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build the mod
-        uses: geode-sdk/build-geode-mod@main
-        with:
-          bindings: geode-sdk/bindings
-          bindings-ref: main
-          combine: true
-          target: ${{ matrix.config.target }}
+	strategy:
+	  fail-fast: false
+	  matrix:
+		config:
+		- name: Windows
+		  os: windows-latest
+
+		- name: macOS
+		  os: macos-latest
+
+		- name: iOS
+		  os: macos-latest
+		  target: iOS
+
+		- name: Android32
+		  os: ubuntu-latest
+		  target: Android32
+
+		- name: Android64
+		  os: ubuntu-latest
+		  target: Android64
+
+	name: ${{ matrix.config.name }}
+	runs-on: ${{ matrix.config.os }}
+
+	steps:
+	  - uses: actions/checkout@v4
+
+	  - name: Build the mod
+		uses: geode-sdk/build-geode-mod@main
+		with:
+		  bindings: geode-sdk/bindings
+		  bindings-ref: main
+		  combine: true
+		  target: ${{ matrix.config.target }}
 
   package:
-    name: Package builds
-    runs-on: ubuntu-latest
-    needs: ['build']
-
-    steps:
-      - uses: geode-sdk/build-geode-mod/combine@main
-        id: build
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: Build Output
-          path: ${{ steps.build.outputs.build-output }}
+	name: Package builds
+	runs-on: ubuntu-latest
+	needs: ['build']
+
+	steps:
+	  - uses: geode-sdk/build-geode-mod/combine@main
+		id: build
+
+	  - uses: actions/upload-artifact@v4
+		with:
+		  name: Build Output
+		  path: ${{ steps.build.outputs.build-output }}

CHANGELOG.MD

@@ -1,3 +1,6 @@
+# 1.3.3
+- Fixed compatibility with Better Touch Prio
+
 # 1.3.2
 - Updated to Geode 4.7.0
 

CMakeLists.txt

@@ -4,25 +4,25 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "iOS" OR IOS)
-    set(CMAKE_OSX_ARCHITECTURES "arm64")
+	set(CMAKE_OSX_ARCHITECTURES "arm64")
 else()
-    set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
+	set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
 endif()
 
-project(Zoom VERSION 1.1.0)
+project(Zoom VERSION 1.0.0)
 
 add_library(${PROJECT_NAME} SHARED
-    src/main.cpp
-    src/utils.cpp
-    src/desktop.cpp
-    src/mobile.cpp
-    src/settings.cpp
+	src/main.cpp
+	src/utils.cpp
+	src/desktop.cpp
+	src/mobile.cpp
+	src/settings.cpp
 )
 
 if (NOT DEFINED ENV{GEODE_SDK})
-    message(FATAL_ERROR "Unable to find Geode SDK! Please define GEODE_SDK environment variable to point to Geode")
+	message(FATAL_ERROR "Unable to find Geode SDK! Please define GEODE_SDK environment variable to point to Geode")
 else()
-    message(STATUS "Found Geode: $ENV{GEODE_SDK}")
+	message(STATUS "Found Geode: $ENV{GEODE_SDK}")
 endif()
 
 add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)

build.ps1

@@ -14,9 +14,9 @@ if ($platform -eq "windows") {
 
 	$gdpid = $null
 	while ([string]::IsNullOrEmpty($gdpid)) {
-        Start-Sleep -Milliseconds 100
-        $gdpid = adb shell pidof com.geode.launcher
-    }
+		Start-Sleep -Milliseconds 100
+		$gdpid = adb shell pidof com.geode.launcher
+	}
 
 	try {
 		adb logcat --pid $gdpid

mod.json

@@ -1,5 +1,5 @@
 {
-	"geode": "4.7.0",
+	"geode": "4.9.0",
 	"gd": {
 		"win": "2.2074",
 		"android": "2.2074",
@@ -8,7 +8,7 @@
 	},
 	"id": "bobby_shmurner.zoom",
 	"name": "Zoooom!",
-	"version": "1.3.2",
+	"version": "1.3.3",
 	"developer": "Bobby Shmurner",
 	"description": "Allows you to zoom while paused!",
 	"links": {
@@ -20,16 +20,16 @@
 			"importance": "required"
 		},
 		"geode.custom-keybinds": {
-            "version": ">=v1.10.3",
-            "importance": "required",
+			"version": ">=v1.10.3",
+			"importance": "required",
 			"platforms": ["win", "mac"]
-        }
+		}
 	},
 	"resources": {
-        "sprites": [
-            "resources/*.png"
-        ]
-    },
+		"sprites": [
+			"resources/*.png"
+		]
+	},
 	"tags": [
 		"enhancement",
 		"interface",

src/mobile.cpp

@@ -9,7 +9,7 @@
 
 using namespace geode::prelude;
 AndroidZoomLayer* AndroidZoomLayer::instance = nullptr;
-	
+
 AndroidZoomLayer* AndroidZoomLayer::create(CCNode* sceneLayer) {
 	if (instance) {
 		instance = nullptr;
@@ -22,7 +22,7 @@ AndroidZoomLayer* AndroidZoomLayer::create(CCNode* sceneLayer) {
 		instance = layer;
 		return layer;
 	}
-	
+
 	delete layer;
 	return nullptr;
 }
@@ -36,8 +36,8 @@ bool AndroidZoomLayer::init(CCNode* sceneLayer) {
 		return false;
 	}
 
-	if (sceneLayer->getChildByID("AnodroidZoomLayer")) {
-		geode::log::error("AnodroidZoomLayer already exists in scene!");
+	if (sceneLayer->getChildByID("AndroidZoomLayer"_spr)) {
+		geode::log::error("AndroidZoomLayer already exists in scene!");
 		return false;
 	}
 
@@ -63,23 +63,24 @@ bool AndroidZoomLayer::init(CCNode* sceneLayer) {
 	// https://github.com/TheSillyDoggo/GeodeMenu/blob/17b19215b80a263379a560edfaf63c2a3f17e2f8/src/Client/AndroidUI.cpp#L28
 
 	auto backMenu = CCMenu::create();
-    backMenu->ignoreAnchorPointForPosition(false);
-    backMenu->setContentSize(ccp(0, 0));
-    backMenu->setPositionX(0);
-    backMenu->setPositionY(CCDirector::get()->getWinSize().height);
-    backMenu->setID("back-menu");
+	backMenu->ignoreAnchorPointForPosition(false);
+	backMenu->setContentSize(ccp(0, 0));
+	backMenu->setPositionX(0);
+	backMenu->setPositionY(CCDirector::get()->getWinSize().height);
+	backMenu->setID("back-menu");
 	this->addChild(backMenu);
 
-    auto backSpr = CCSprite::createWithSpriteFrameName("GJ_arrow_03_001.png");
+	auto backSpr = CCSprite::createWithSpriteFrameName("GJ_arrow_03_001.png");
 	backSpr->setOpacity(100);
-	
-    auto backBtn = CCMenuItemSpriteExtra::create(backSpr, this, menu_selector(AndroidZoomLayer::onBackButton));
-    backBtn->setPosition(ccp(24, -23));
-    backBtn->setSizeMult(1.15f);
 
-    backMenu->addChild(backBtn);
-	
-	this->setID("AnodroidZoomLayer");
+	auto backBtn = CCMenuItemSpriteExtra::create(backSpr, this, menu_selector(AndroidZoomLayer::onBackButton));
+	backBtn->setPosition(ccp(24, -23));
+	backBtn->setSizeMult(1.15f);
+
+	backMenu->addChild(backBtn);
+
+	this->setID("AndroidZoomLayer"_spr);
+    this->setZOrder(11); // One above PauseLayer
 
 	CCDirector::sharedDirector()->getTouchDispatcher()->addTargetedDelegate(this, -250, true);
 	this->setTouchEnabled(true);
@@ -133,15 +134,15 @@ void AndroidZoomLayer::ccTouchMoved(CCTouch* pTouch, CCEvent* pEvent) {
 		CCPoint newAnchor = getAnchorPoint(movingTouch, anchoredTouch);
 		CCPoint deltaAnchor = ccpSub(newAnchor, m_ZoomAnchor);
 		m_ZoomAnchor = newAnchor;
-		
+
 		// Move the play layer based on the delta of the anchor point
 		CCPoint pos = m_playLayer->getPosition();
 		m_playLayer->setPosition(pos.x + deltaAnchor.x, pos.y + deltaAnchor.y);
-		
+
 		CCPoint delta = movingTouch->getDelta();
 		CCPoint touchDisplacement = ccpSub(movingTouch->getLocation(), anchoredTouch->getLocation());
 		float scaleDelta = touchDisplacement.normalize().dot(delta) / 100.0f;
-		
+
 		zoomPlayLayer(m_playLayer, scaleDelta, m_ZoomAnchor);
 		clampPlayLayerPos(m_playLayer);
 	}
@@ -173,7 +174,7 @@ CCPoint AndroidZoomLayer::getAnchorPoint(CCTouch* movingTouch, CCTouch* anchored
 		(movingTouchPos.y + anchoredTouchPos.y) / 2
 	);
 }
-	
+
 class $modify(AndroidZoomPauseLayer, PauseLayer) {
 	void customSetup() {
 		PauseLayer::customSetup();
@@ -183,10 +184,10 @@ class $modify(AndroidZoomPauseLayer, PauseLayer) {
 		auto zoomButtonSprite = CircleButtonSprite::createWithSprite("zoom_button.png"_spr, 1.0f, CircleBaseColor::Green, CircleBaseSize::MediumAlt);
 		zoomButtonSprite->getTopNode()->setScale(1.0f);
 		zoomButtonSprite->setScale(0.6f);
-	
+
 		auto zoomButton = CCMenuItemSpriteExtra::create(zoomButtonSprite, this, menu_selector(AndroidZoomPauseLayer::onZoomButton));
 		zoomButton->setID("zoom-button"_spr);
-	
+
 		rightButtonMenu->addChild(zoomButton);
 		rightButtonMenu->updateLayout();
 	}

src/settings.cpp

@@ -36,13 +36,13 @@ void SettingsManager::init() {
 		zoomSensitivity = sensitivity;
 	});
 
-    BindManager::get()->registerBindable({
-        "toggle_menu"_spr,
-        "Toggle Pause Menu",
-        "",
-        { Keybind::create(KEY_Home, Modifier::None) },
-        "Zoom",
+	BindManager::get()->registerBindable({
+		"toggle_menu"_spr,
+		"Toggle Pause Menu",
+		"",
+		{ Keybind::create(KEY_Home, Modifier::None) },
+		"Zoom",
 		false
-    });
+	});
 	#endif // GEODE_IS_DESKTOP
 }