notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

continued on making cursors work.

Browse Source
This commit is contained in:
=
2014-09-15 22:30:01 -07:00
parent e5b2f95699
commit 722efb5a25
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/cursor.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

7
desktop/src-common/advent/screens/scene.clj
View File

@@ -36,12 +36,15 @@
(defn find-override [screen entities [x y]]
(first (filter #(mouse-in? % [x y])
(get-in entities [:background :mouse-overrides]))))
(defn left-click [screen entities]
(let [{:keys [x y]} (input->screen screen {:x (:input-x screen) :y (:input-y screen)})
interaction (first (filter #(mouse-in? % [x y])
(get-in entities [:background :interactions])))
cursor-override (get-in entities [:cursor :override])
cursor-override (find-override screen entities [x y])
;; TODO - hacky way of resetting queue
entities (if-let [current-action (get-in entities [:actions :current])]
(assoc (actions/terminate current-action screen entities)
@@ -220,7 +223,7 @@
:on-mouse-moved
(fn [screen [entities]]
(let [{:keys [x y]} (input->screen screen {:x (:input-x screen) :y (:input-y screen)})]
(if-let [mouse-override (first (filter #(mouse-in? % [x y]) (get-in entities [:background :mouse-overrides])))]
(if-let [mouse-override (find-override screen entities [x y])]
(assoc-in entities [:cursor :override] (cursor-override mouse-override))
(assoc-in entities [:cursor :override] nil))))