Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-24 15:39:50 -05:00
Code Issues Activity

🐛 Take into account zoom when selecting objects with rect

Browse source
This commit is contained in:
Andrés Moya 2020-04-14 12:36:32 +02:00
parent 043cf27ace
commit 3fd1513128
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frontend/src/uxbox/main/data/workspace.cljs
View file

@ -1169,17 +1169,19 @@
(defn impl-match-by-selrect (defn impl-match-by-selrect
[state selrect] [state selrect]
(let [page-id (::page-id state) (let [zoom (gpt/point (get-in state [:workspace-local :zoom]))
selrect' (geom/apply-zoom selrect zoom)
page-id (::page-id state)
data (get-in state [:workspace-data page-id]) data (get-in state [:workspace-data page-id])
match (fn [acc {:keys [type id] :as shape}] match (fn [acc {:keys [type id] :as shape}]
(cond (cond
(helpers/is-shape-grouped (:id shape) (:objects data)) (helpers/is-shape-grouped (:id shape) (:objects data))
acc acc
(geom/contained-in? shape selrect) (geom/contained-in? shape selrect')
(conj acc id) (conj acc id)
(geom/overlaps? shape selrect) (geom/overlaps? shape selrect')
(conj acc id) (conj acc id)
:else :else

8
frontend/src/uxbox/main/geom.cljs
View file

@ -701,6 +701,14 @@
;; --- Helpers ;; --- Helpers
(defn apply-zoom
[selrect zoom]
(assoc selrect
:x (/ (:x selrect) (:x zoom))
:y (/ (:y selrect) (:y zoom))
:width (/ (:width selrect) (:x zoom))
:height (/ (:height selrect) (:y zoom))))
(defn contained-in? (defn contained-in?
"Check if a shape is contained in the "Check if a shape is contained in the
provided selection rect." provided selection rect."