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

🐛 Fix problem with auto-width/auto-height + lock-proportions

Browse source
This commit is contained in:
alonso.torres 2022-12-14 12:10:24 +01:00 • committed by Alejandro Alonso
parent ca7ebdcc8f
commit 7507a3b74f
3 changed files with 41 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -319,8 +319,11 @@
(letfn [(update-fn [shape]
(let [{:keys [selrect grow-type]} shape
{shape-width :width shape-height :height} selrect
modifier-width (gsh/resize-modifiers shape :width new-width)
modifier-height (gsh/resize-modifiers shape :height new-height)]
;; Ignore lock proportions otherwise the auto-width/auto-height cannot correctly set
;; the sizes
modifier-width (gsh/resize-modifiers shape :width new-width {:ignore-lock? true})
modifier-height (gsh/resize-modifiers shape :height new-height {:ignore-lock? true})]
(cond-> shape
(and (not-changed? shape-width new-width) (= grow-type :auto-width))
(-> (assoc :modifiers modifier-width)
@ -346,8 +349,8 @@
(defn apply-text-modifier
[shape {:keys [width height position-data]}]
(let [modifier-width (when width (gsh/resize-modifiers shape :width width))
modifier-height (when height (gsh/resize-modifiers shape :height height))
(let [modifier-width (when width (gsh/resize-modifiers shape :width width {:ignore-lock? true}))
modifier-height (when height (gsh/resize-modifiers shape :height height {:ignore-lock? true}))
new-shape
(cond-> shape