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

🐛 Fix problem with snap to guides and zoom

Browse source
This commit is contained in:
alonso.torres 2024-02-22 16:42:26 +01:00
parent d51338e754
commit fdf6f0dfef
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
frontend/src/app/main/snap.cljs
View file

@ -83,14 +83,15 @@
(defn get-snap-points [page-id frame-id remove-snap? zoom point coord] (defn get-snap-points [page-id frame-id remove-snap? zoom point coord]
(let [value (get point coord) (let [value (get point coord)
vbox @refs/vbox] vbox @refs/vbox]
(->> (uw/ask! {:cmd :snaps/range-query (let [ranges [[(- value (/ 0.5 zoom)) (+ value (/ 0.5 zoom))]]]
:page-id page-id (->> (uw/ask! {:cmd :snaps/range-query
:frame-id frame-id :page-id page-id
:axis coord :frame-id frame-id
:bounds vbox :axis coord
:ranges [[(- value (/ 0.5 zoom)) (+ value (/ 0.5 zoom))]]}) :bounds vbox
(rx/take 1) :ranges ranges})
(rx/map (remove-from-snap-points remove-snap?))))) (rx/take 1)
(rx/map (remove-from-snap-points remove-snap?))))))
(defn- search-snap (defn- search-snap
[page-id frame-id points coord remove-snap? zoom] [page-id frame-id points coord remove-snap? zoom]

3
frontend/src/app/worker/snaps.cljs
View file

@ -28,7 +28,8 @@
[{:keys [page-id frame-id axis ranges bounds] :as message}] [{:keys [page-id frame-id axis ranges bounds] :as message}]
(let [match-bounds? (let [match-bounds?
(fn [[_ data]] (fn [[_ data]]
(some #(grc/contains-point? bounds %) (map :pt data)))] (some #(or (= :guide (:type %))
(grc/contains-point? bounds (:pt %))) data))]
(->> (into [] (->> (into []
(comp (mapcat #(sd/query @state page-id frame-id axis %)) (comp (mapcat #(sd/query @state page-id frame-id axis %))
(distinct)) (distinct))