try adding mouse actions to touchpad to see if a separate element is …

…really needed
Nerwyn · Dec 9, 2024 · aabbecb · aabbecb
1 parent 17325bb
commit aabbecb
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 26 deletions.
diff --git a/dist/universal-remote-card.min.js b/dist/universal-remote-card.min.js
diff --git a/src/classes/remote-mousepad.ts b/src/classes/remote-mousepad.ts
@@ -46,9 +46,12 @@ export class RemoteMousepad extends RemoteTouchpad {
 			Math.abs(Math.abs(this.deltaX ?? 0) - Math.abs(this.deltaY ?? 0)) >
 				sensitivity
 		) {
-			clearTimeout(this.holdTimer);
-			this.holdMove = true;
-			this.sendAction(`${this.getMultiPrefix()}mouse_action`);
+			if (this.holdTimer) {
+				clearTimeout(this.holdTimer);
+				this.holdTimer = undefined;
+				this.holdMove = true;
+				this.sendAction(`${this.getMultiPrefix()}mouse_action`);
+			}
 		}
 	}
 

diff --git a/src/classes/remote-touchpad.ts b/src/classes/remote-touchpad.ts
@@ -155,36 +155,55 @@ export class RemoteTouchpad extends BaseRemoteElement {
 		this.setDeltaXY(e);
 		const totalDeltaX = (this.currentX ?? 0) - this.initialX;
 		const totalDeltaY = (this.currentY ?? 0) - this.initialY;
-		console.log(`INITIAL: ${this.initialX},${this.initialY}`);
-		console.log(`CURRENT: ${this.currentX},${this.currentY}`);
-		console.log(`TOTAL DELTA: ${totalDeltaX},${totalDeltaY}`);
 
 		// Only consider significant enough movement
 		const sensitivity = 2;
 		if (
-			Math.abs(Math.abs(totalDeltaX) - Math.abs(totalDeltaY)) >
-			sensitivity
+			this.renderTemplate(this.config.mouse_action?.action ?? 'none') !=
+				'none' ||
+			((this.targetTouches?.length ?? 0) > 1 &&
+				this.renderTemplate(
+					this.config.multi_mouse_action?.action ?? 'none',
+				) != 'none')
 		) {
-			if (Math.abs(totalDeltaX) > Math.abs(totalDeltaY)) {
-				// Sliding horizontally
-				this.direction = totalDeltaX < 0 ? 'left' : 'right';
-			} else {
-				// Sliding vertically
-				this.direction = totalDeltaY < 0 ? 'up' : 'down';
-			}
-			console.log(this.direction);
-			if (!this.holdMove) {
-				this.fireHapticEvent('light');
-				this.sendAction(
-					`${this.getMultiPrefix()}tap_action`,
-					this.getActions(),
-				);
-				this.holdMove = true;
-
+			if (
+				this.holdMove ||
+				Math.abs(
+					Math.abs(this.deltaX ?? 0) - Math.abs(this.deltaY ?? 0),
+				) > sensitivity
+			) {
 				if (this.holdTimer) {
 					clearTimeout(this.holdTimer);
 					this.holdTimer = undefined;
-					this.setHoldTimer();
+					this.holdMove = true;
+					this.sendAction(`${this.getMultiPrefix()}mouse_action`);
+				}
+			}
+		} else {
+			if (
+				Math.abs(Math.abs(totalDeltaX) - Math.abs(totalDeltaY)) >
+				sensitivity
+			) {
+				if (Math.abs(totalDeltaX) > Math.abs(totalDeltaY)) {
+					// Sliding horizontally
+					this.direction = totalDeltaX < 0 ? 'left' : 'right';
+				} else {
+					// Sliding vertically
+					this.direction = totalDeltaY < 0 ? 'up' : 'down';
+				}
+				if (!this.holdMove) {
+					this.fireHapticEvent('light');
+					this.sendAction(
+						`${this.getMultiPrefix()}tap_action`,
+						this.getActions(),
+					);
+					this.holdMove = true;
+
+					if (this.holdTimer) {
+						clearTimeout(this.holdTimer);
+						this.holdTimer = undefined;
+						this.setHoldTimer();
+					}
 				}
 			}
 		}