3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-23 11:16: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

8
frontend/src/app/main/data/workspace/texts.cljs
View file

@ -331,13 +331,13 @@
shape
(cond-> shape
(and (not-changed? shape-width new-width) (= grow-type :auto-width))
(gsh/transform-shape (ctm/change-dimensions-modifiers shape :width new-width)))
(gsh/transform-shape (ctm/change-dimensions-modifiers shape :width new-width {:ignore-lock? true})))
shape
(cond-> shape
(and (not-changed? shape-height new-height)
(or (= grow-type :auto-height) (= grow-type :auto-width)))
(gsh/transform-shape (ctm/change-dimensions-modifiers shape :height new-height)))]
(gsh/transform-shape (ctm/change-dimensions-modifiers shape :height new-height {:ignore-lock? true})))]
shape))]
@ -364,10 +364,10 @@
(let [new-shape
(cond-> shape
(some? width)
(gsh/transform-shape (ctm/change-dimensions-modifiers shape :width width))
(gsh/transform-shape (ctm/change-dimensions-modifiers shape :width width {:ignore-lock? true}))
(some? height)
(gsh/transform-shape (ctm/change-dimensions-modifiers shape :height height))
(gsh/transform-shape (ctm/change-dimensions-modifiers shape :height height {:ignore-lock? true}))
(some? position-data)
(assoc :position-data position-data))

6
frontend/src/app/main/data/workspace/transforms.cljs
View file

@ -643,8 +643,10 @@
(recursive-find-empty-parents parents))))
empty-parents
;; Any parent whose children are moved should be deleted
(into (d/ordered-set) (find-all-empty-parents #{}))
;; Any empty parent whose children are moved to another frame should be deleted
(if (empty? moving-shapes)
#{}
(into (d/ordered-set) (find-all-empty-parents #{})))
changes
(-> (pcb/empty-changes it page-id)