Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-10 08:50:57 -05:00
Code Issues Activity

🐛 Fix problem with snap-pixel for very big shapes

Browse source
This commit is contained in:
alonso.torres 2023-01-09 11:06:09 +01:00
parent c2e0b18f26
commit 1fdf09a692
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/src/app/common/geom/shapes/pixel_precision.cljc
View file

@ -35,9 +35,8 @@
ratio-width (/ target-width curr-width)
ratio-height (/ target-height curr-height)
scalev (gpt/point ratio-width ratio-height)]
(-> modifiers
(ctm/resize scalev origin transform transform-inverse))))
(ctm/resize scalev origin transform transform-inverse {:precise? true}))))
(defn position-pixel-precision
[modifiers _ points]

28
common/src/app/common/types/modifiers.cljc
View file

@ -177,17 +177,19 @@
(defn- maybe-add-resize
"Check the last operation to check if we can stack it over the last one"
[operations op]
([operations op]
(maybe-add-resize operations op nil))
(if (c/empty? operations)
[op]
(let [head (peek operations)]
(if (mergeable-resize? head op)
(let [item (merge-resize head op)]
(cond-> (pop operations)
(resize-vec? (dm/get-prop item :vector))
(conj item)))
(conj operations op)))))
([operations op {:keys [precise?]}]
(if (c/empty? operations)
[op]
(let [head (peek operations)]
(if (mergeable-resize? head op)
(let [item (merge-resize head op)]
(cond-> (pop operations)
(or precise? (resize-vec? (dm/get-prop item :vector)))
(conj item)))
(conj operations op))))))
(defn valid-vector?
[vector]
@ -259,12 +261,16 @@
(update :geometry-child maybe-add-resize (resize-op order vector origin)))))
([modifiers vector origin transform transform-inverse]
(resize modifiers vector origin transform transform-inverse nil))
;; `precise?` works so we don't remove almost empty resizes. This will be used in the pixel-precision
([modifiers vector origin transform transform-inverse {:keys [precise?]}]
(assert (valid-vector? vector) (dm/str "Invalid move vector: " (:x vector) "," (:y vector)))
(let [modifiers (or modifiers (empty))
order (inc (dm/get-prop modifiers :last-order))
modifiers (assoc modifiers :last-order order)]
(cond-> modifiers
(resize-vec? vector)
(or precise? (resize-vec? vector))
(update :geometry-child maybe-add-resize (resize-op order vector origin transform transform-inverse))))))
(defn rotation