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

Merge remote-tracking branch 'origin/staging' into develop

Browse source
This commit is contained in:
alonso.torres 2022-12-14 13:01:23 +01:00
commit 2ce36ce052
4 changed files with 34 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -443,33 +443,36 @@
(resize-modifiers (gpt/point scalex scaley) origin transform transform-inverse)))
(defn change-dimensions-modifiers
[{:keys [transform transform-inverse] :as shape} attr value]
(us/assert map? shape)
(us/assert #{:width :height} attr)
(us/assert number? value)
([shape attr value]
(change-dimensions-modifiers shape attr value nil))
(let [{:keys [proportion proportion-lock]} shape
size (select-keys (:selrect shape) [:width :height])
new-size (if-not proportion-lock
(assoc size attr value)
(if (= attr :width)
(-> size
(assoc :width value)
(assoc :height (/ value proportion)))
(-> size
(assoc :height value)
(assoc :width (* value proportion)))))
([{:keys [transform transform-inverse] :as shape} attr value {:keys [ignore-lock?] :or {ignore-lock? false}}]
(us/assert map? shape)
(us/assert #{:width :height} attr)
(us/assert number? value)
width (:width new-size)
height (:height new-size)
(let [{:keys [proportion proportion-lock]} shape
size (select-keys (:selrect shape) [:width :height])
new-size (if-not (and (not ignore-lock?) proportion-lock)
(assoc size attr value)
(if (= attr :width)
(-> size
(assoc :width value)
(assoc :height (/ value proportion)))
(-> size
(assoc :height value)
(assoc :width (* value proportion)))))
{sr-width :width sr-height :height} (:selrect shape)
width (:width new-size)
height (:height new-size)
origin (-> shape :points first)
scalex (/ width sr-width)
scaley (/ height sr-height)]
{sr-width :width sr-height :height} (:selrect shape)
(resize-modifiers (gpt/point scalex scaley) origin transform transform-inverse)))
origin (-> shape :points first)
scalex (/ width sr-width)
scaley (/ height sr-height)]
(resize-modifiers (gpt/point scalex scaley) origin transform transform-inverse))))
(defn change-orientation-modifiers
[shape orientation]