3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-18 21:57:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix padding prediction does not work with one shape

Browse source
This commit is contained in:
Pablo Alba 2023-03-24 17:23:11 +01:00 • committed by Alonso Torres
parent 300ad15f5a
commit 0f9ad0907e
1 changed files with 38 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

9
frontend/src/app/main/data/workspace/shape_layout.cljs
View file

@ -143,17 +143,16 @@
(/ (- (- max-y min-y) all-height) (dec (count shapes))) (/ (- (- max-y min-y) all-height) (dec (count shapes)))
0) 0)
layout-gap {:row-gap row-gap :column-gap column-gap} layout-gap {:row-gap (max row-gap 0) :column-gap (max column-gap 0)}
parent-selrect (:selrect parent) parent-selrect (:selrect parent)
padding (when (and (not (nil? parent)) (> (count shapes) 1)) padding (when (and (not (nil? parent)) (> (count shapes) 0))
{:p1 (min (- min-y (:y1 parent-selrect)) (- (:y2 parent-selrect) max-y)) {:p1 (min (- min-y (:y1 parent-selrect)) (- (:y2 parent-selrect) max-y))
:p2 (min (- min-x (:x1 parent-selrect)) (- (:x2 parent-selrect) max-x))})] :p2 (min (- min-x (:x1 parent-selrect)) (- (:x2 parent-selrect) max-x))})]
(cond-> {:layout-flex-dir direction} (cond-> {:layout-flex-dir direction}
(not (nil? padding)) (assoc :layout-padding {:p1 (:p1 padding) :p2 (:p2 padding) :p3 (:p1 padding) :p4 (:p2 padding)} (not (nil? padding)) (assoc :layout-padding {:p1 (:p1 padding) :p2 (:p2 padding) :p3 (:p1 padding) :p4 (:p2 padding)})
:layout-align-items :center (not (nil? layout-gap)) (assoc :layout-gap layout-gap)))))
:layout-gap layout-gap)))))
(defn shapes->grid-params (defn shapes->grid-params
"Given the shapes calculate its flex parameters (horizontal vs vertical, gaps, etc)" "Given the shapes calculate its flex parameters (horizontal vs vertical, gaps, etc)"