github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-05-06 00:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9335 from penpot/alotor-fix-flex-auto-height

Browse Source 
🐛 Fix problem with flex layout and text auto-height
This commit is contained in:
Alejandro Alonso 2026-05-05 15:50:22 +02:00 committed by GitHub
commit ce1045c265
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
render-wasm/src/shapes/modifiers.rs
View File

@ -10,6 +10,7 @@ use crate::math::{self as math, bools, identitish, is_close_to, Bounds, Matrix,
use common::GetBounds;
use crate::error::Result;
use crate::shapes;
use crate::shapes::{
ConstraintH, ConstraintV, Frame, Group, GrowType, Layout, Modifier, Shape, TransformEntry,
TransformEntrySource, Type,
@ -173,6 +174,7 @@ fn propagate_transform(
entries: &mut VecDeque<Modifier>,
bounds: &mut HashMap<Uuid, Bounds>,
modifiers: &mut HashMap<Uuid, Matrix>,
reflown: &mut HashSet<Uuid>,
) -> Result<()> {
let Some(shape) = state.shapes.get(&entry.id) else {
return Ok(());
@ -203,6 +205,15 @@ fn propagate_transform(
!is_close_to(shape_bounds_before.width(), shape_bounds_after.width());
if width_changed || text_content.needs_update_layout() {
text_content.update_layout(resized_selrect);
entries.push_back(Modifier::reflow(shape.id, false));
if let Some(parent_id) = shape.parent_id {
for pid in
shapes::all_with_ancestors(&[parent_id], shapes, false).iter()
{
reflown.remove(pid);
}
}
}
let height = text_content.size.height;
let resize_transform = math::resize_matrix(
@ -402,6 +413,7 @@ pub fn propagate_modifiers(
&mut entries,
&mut bounds,
&mut modifiers,
&mut reflown,
)?,
Modifier::Reflow(id, force_reflow) => {
if force_reflow {