Check for item "held" via touch instead of touch event

arianne · Dec 2, 2023 · f598d47 · f598d47
1 parent e7ed2e0
commit f598d47
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/srcjs/stendhal/ui/ViewPort.ts b/srcjs/stendhal/ui/ViewPort.ts
@@ -507,10 +507,10 @@ export class ViewPort {
 			// item was dropped
 			stendhal.ui.heldItem = undefined;
 
-			const is_touch = window['TouchEvent'] && e instanceof TouchEvent;
-			// if ctrl is pressed or is a touch event, we ask for the quantity
-			if (e.ctrlKey || is_touch) {
-				ui.createSingletonFloatingWindow("Quantity", new DropQuantitySelectorDialog(action, is_touch), pos.pageX - 50, pos.pageY - 25);
+			const touch_held = typeof(stendhal.ui.touch.held) !== "undefined";
+			// if ctrl is pressed or holding item from touch event, we ask for the quantity
+			if (e.ctrlKey || touch_held) {
+				ui.createSingletonFloatingWindow("Quantity", new DropQuantitySelectorDialog(action, touch_held), pos.pageX - 50, pos.pageY - 25);
 			} else {
 				marauroa.clientFramework.sendAction(action);
 			}

diff --git a/srcjs/stendhal/ui/component/ItemContainerImplementation.ts b/srcjs/stendhal/ui/component/ItemContainerImplementation.ts
@@ -220,14 +220,13 @@ export class ItemContainerImplementation {
 
 			stendhal.ui.heldItem = undefined;
 
-			// if ctrl is pressed or using touch, we ask for the quantity
-			const is_touch = window["TouchEvent"] && event instanceof TouchEvent;
-			const split_action = (event instanceof DragEvent && event.ctrlKey)
-					|| is_touch;
+			// if ctrl is pressed or holding item from touch event, we ask for the quantity
+			const touch_held = typeof(stendhal.ui.touch.held) !== "undefined";
+			const split_action = (event instanceof DragEvent && event.ctrlKey) || touch_held;
 			if (split_action) {
 				const pos = stendhal.ui.html.extractPosition(event);
 				ui.createSingletonFloatingWindow("Quantity",
-					new DropQuantitySelectorDialog(action, is_touch),
+					new DropQuantitySelectorDialog(action, touch_held),
 					pos.pageX - 50, pos.pageY - 25);
 			} else {
 				marauroa.clientFramework.sendAction(action);