3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-18 23:46:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add mouse-ctrl stream and improve general stream performance.

Browse source
This commit is contained in:
Andrey Antukh 2016-01-30 20:24:19 +02:00
parent 4cf702fb0b
commit e84246aecd
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/uxbox/ui/workspace/base.cljs
View file

@ -89,12 +89,21 @@
(defonce mouse-s (defonce mouse-s
(->> mouse-b (->> mouse-b
(rx/filter #(= (:id %) (:id @page-l))) (rx/filter #(= (:id %) (:id @page-l)))
(rx/map :canvas-coords))) (rx/map :canvas-coords)
(rx/share)))
(defonce mouse-absolute-s (defonce mouse-absolute-s
(->> mouse-b (->> mouse-b
(rx/filter #(= (:id %) (:id @page-l))) (rx/filter #(= (:id %) (:id @page-l)))
(rx/map :window-coords))) (rx/map :window-coords)
(rx/share)))
(defonce mouse-ctrl-s
(->> mouse-b
(rx/filter #(= (:id %) (:id @page-l)))
(rx/map :ctrl)
(rx/dedupe)
(rx/share)))
(defn- coords-delta (defn- coords-delta
[[old new]] [[old new]]
@ -107,7 +116,8 @@
(->> mouse-s (->> mouse-s
(rx/sample 10) (rx/sample 10)
(rx/buffer 2 1) (rx/buffer 2 1)
(rx/map coords-delta))) (rx/map coords-delta)
(rx/share)))
(defonce mouse-position (defonce mouse-position
(->> mouse-s (->> mouse-s

2
src/uxbox/ui/workspace/canvas.cljs
View file

@ -15,6 +15,7 @@
[uxbox.data.workspace :as dw] [uxbox.data.workspace :as dw]
[uxbox.ui.mixins :as mx] [uxbox.ui.mixins :as mx]
[uxbox.ui.dom :as dom] [uxbox.ui.dom :as dom]
[uxbox.ui.keyboard :as kbd]
[uxbox.ui.workspace.base :as wb] [uxbox.ui.workspace.base :as wb]
[uxbox.ui.workspace.canvas.movement] [uxbox.ui.workspace.canvas.movement]
[uxbox.ui.workspace.canvas.draw :refer (draw-area)] [uxbox.ui.workspace.canvas.draw :refer (draw-area)]
@ -112,6 +113,7 @@
(let [x (.-clientX event) (let [x (.-clientX event)
y (.-clientY event) y (.-clientY event)
event {:id (:id page) event {:id (:id page)
:ctrl (kbd/ctrl? event)
:window-coords [x y] :window-coords [x y]
:canvas-coords [(- x offset-x) :canvas-coords [(- x offset-x)
(- y offset-y)]}] (- y offset-y)]}]