From 9a6b1b4b8407751ac779264621c563dba248787c Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Sat, 22 Jul 2017 19:51:30 -0700 Subject: [PATCH] fixed issue with pinching. --- desktop/src-common/advent/screens/scene.clj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 71812786..a0c35218 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -1450,10 +1450,11 @@ :on-touch-up (fn [screen entities options] (let [currently-pressed (dec (get-in entities [:cursor :counter] 1)) max-pressed (get-in entities [:cursor :max-counter] 1)] - (println "touched up" currently-pressed max-pressed) + (println "touched up" currently-pressed max-pressed (get-in entities [:state :hud-active?]) (get-in entities [:state :active?]) (get-in entities [:cam :pinching])) (cond (and (<= currently-pressed 0) - (<= max-pressed 1)) + (<= max-pressed 1) + (not (get-in entities [:cam :pinching]))) (handle-touch-up screen (-> entities (assoc-in [:cursor :counter] 0)