mirror of
https://github.com/penpot/penpot.git
synced 2025-01-08 07:50:43 -05:00
🐛 Fix problem with flex layout fit to content not positioning correctly children
This commit is contained in:
parent
2c21a049e1
commit
3ad91d1c9d
2 changed files with 9 additions and 1 deletions
|
@ -24,6 +24,7 @@
|
||||||
- Fix color palette default library [Taiga #8029](https://tree.taiga.io/project/penpot/issue/8029)
|
- Fix color palette default library [Taiga #8029](https://tree.taiga.io/project/penpot/issue/8029)
|
||||||
- Component Library is lost after exporting/importing in .zip format [Github #4672](https://github.com/penpot/penpot/issues/4672)
|
- Component Library is lost after exporting/importing in .zip format [Github #4672](https://github.com/penpot/penpot/issues/4672)
|
||||||
- Fix problem with moving+selection not working properly [Taiga #7943](https://tree.taiga.io/project/penpot/issue/7943)
|
- Fix problem with moving+selection not working properly [Taiga #7943](https://tree.taiga.io/project/penpot/issue/7943)
|
||||||
|
- Fix problem with flex layout fit to content not positioning correctly children [Taiga #7537](https://tree.taiga.io/project/penpot/issue/7537)
|
||||||
|
|
||||||
## 2.0.3
|
## 2.0.3
|
||||||
|
|
||||||
|
|
|
@ -269,6 +269,13 @@
|
||||||
(keep (mk-check-auto-layout objects))
|
(keep (mk-check-auto-layout objects))
|
||||||
shapes)))
|
shapes)))
|
||||||
|
|
||||||
|
(defn full-tree?
|
||||||
|
"Checks if we need to calculate the full tree or we can calculate just a partial tree. Partial
|
||||||
|
trees are more efficient but cannot be done when the layout is centered."
|
||||||
|
[objects layout-id]
|
||||||
|
(let [layout-justify-content (get-in objects [layout-id :layout-justify-content])]
|
||||||
|
(contains? #{:center :end :space-around :space-evenly :stretch} layout-justify-content)))
|
||||||
|
|
||||||
(defn sizing-auto-modifiers
|
(defn sizing-auto-modifiers
|
||||||
"Recalculates the layouts to adjust the sizing: auto new sizes"
|
"Recalculates the layouts to adjust the sizing: auto new sizes"
|
||||||
[modif-tree sizing-auto-layouts objects bounds ignore-constraints]
|
[modif-tree sizing-auto-layouts objects bounds ignore-constraints]
|
||||||
|
@ -286,7 +293,7 @@
|
||||||
(d/seek sizing-auto-layouts))
|
(d/seek sizing-auto-layouts))
|
||||||
|
|
||||||
shapes
|
shapes
|
||||||
(if from-layout
|
(if (and from-layout (not (full-tree? objects from-layout)))
|
||||||
(cgst/resolve-subtree from-layout layout-id objects)
|
(cgst/resolve-subtree from-layout layout-id objects)
|
||||||
(cgst/resolve-tree #{layout-id} objects))
|
(cgst/resolve-tree #{layout-id} objects))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue