mouse cursor doesn't stay highlighted.
This commit is contained in:
@@ -677,7 +677,8 @@ void main()
|
||||
(= active was-active))
|
||||
(let [image-path (if active "cursor_light.png" "cursor.png")]
|
||||
(input! :set-cursor-image (utils/cursor image-path (or (:cursor new-current) new-current)) 0 0)))
|
||||
(assoc-in entities [:cursor :last] new-current))
|
||||
(update-in entities [:cursor ] assoc :last new-current
|
||||
:was-active active))
|
||||
entities))
|
||||
|
||||
|
||||
@@ -824,6 +825,14 @@ void main()
|
||||
:else
|
||||
[x1 x2]))
|
||||
|
||||
(defn mouse-moved [{:keys [input-x input-y viewport] :as screen} [entities]]
|
||||
(if (utils/contains-point? (.getScreenX viewport) (.getScreenY viewport)
|
||||
(.getScreenWidth viewport) (.getScreenHeight viewport)
|
||||
input-x input-y)
|
||||
|
||||
(utils/update-override screen (assoc-in entities [:cursor :last-pos] [input-x input-y]))
|
||||
(assoc-in entities [:cursor :override] nil)))
|
||||
|
||||
(defscreen scene
|
||||
:on-timer
|
||||
(fn [screen [entities]]
|
||||
@@ -1012,14 +1021,11 @@ void main()
|
||||
(utils/stop-sound snd)))
|
||||
|
||||
:on-mouse-moved
|
||||
(fn [{:keys [input-x input-y viewport] :as screen} [entities]]
|
||||
(if (utils/contains-point? (.getScreenX viewport) (.getScreenY viewport)
|
||||
(.getScreenWidth viewport) (.getScreenHeight viewport)
|
||||
input-x input-y)
|
||||
|
||||
(utils/update-override screen (assoc-in entities [:cursor :last-pos] [input-x input-y]))
|
||||
(assoc-in entities [:cursor :override] nil)))
|
||||
|
||||
mouse-moved
|
||||
|
||||
:on-touch-dragged
|
||||
mouse-moved
|
||||
|
||||
:on-touch-up (fn [{:keys [input-x input-y viewport] :as screen} [entities]]
|
||||
(when (utils/contains-point? (.getScreenX viewport) (.getScreenY viewport)
|
||||
(.getScreenWidth viewport) (.getScreenHeight viewport)
|
||||
|
||||
Reference in New Issue
Block a user