language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-04 10:50:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

compiler: fix materialize_fake_properties change

Browse source
This commit is contained in:
Alex Badics 2025-02-20 18:43:18 +01:00 • committed by Olivier Goffart
parent 3e67c93097
commit 61df727c48
1 changed files with 33 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

58
internal/compiler/passes/materialize_fake_properties.rs
View file

@ -149,33 +149,41 @@ pub fn initialize(elem: &ElementRc, name: &str) -> Option<Expression> {
};
}
let builtin_name = match elem.borrow().builtin_type() {
Some(b) => b.name.clone(),
None => SmolStr::default(),
};
let expr = match (name, builtin_name.as_str()) {
("min-height", "Image") => Expression::NumberLiteral(0., Unit::Px),
("min-width", "Image") => Expression::NumberLiteral(0., Unit::Px),
("max-height", "Image") => Expression::NumberLiteral(f32::MAX as _, Unit::Px),
("max-width", "Image") => Expression::NumberLiteral(f32::MAX as _, Unit::Px),
("horizontal-stretch", "Image") => Expression::NumberLiteral(0., Unit::None),
("vertical-stretch", "Image") => Expression::NumberLiteral(0., Unit::None),
("min-height", _) => layout_constraint_prop(elem, "min", Orientation::Vertical),
("min-width", _) => layout_constraint_prop(elem, "min", Orientation::Horizontal),
("max-height", _) => layout_constraint_prop(elem, "max", Orientation::Vertical),
("max-width", _) => layout_constraint_prop(elem, "max", Orientation::Horizontal),
("horizontal-stretch", _) => {
layout_constraint_prop(elem, "stretch", Orientation::Horizontal)
// Hardcode properties for images, because this is a very common call, and this allows
// later optimization steps to eliminate these properties.
// Note that Rectangles and Empties are similarly optimized in layout_constraint_prop, and
// we rely on struct field access simplification for those.
if elem.borrow().builtin_type().map_or(false, |n| n.name == "Image") {
if elem.borrow().layout_info_prop(Orientation::Horizontal).is_none() {
match name {
"min-width" => return Some(Expression::NumberLiteral(0., Unit::Px)),
"max-width" => return Some(Expression::NumberLiteral(f32::MAX as _, Unit::Px)),
"horizontal-stretch" => return Some(Expression::NumberLiteral(0., Unit::None)),
_ => {}
}
}
("vertical-stretch", _) => layout_constraint_prop(elem, "stretch", Orientation::Vertical),
("preferred-height", _) => layout_constraint_prop(elem, "preferred", Orientation::Vertical),
("preferred-width", _) => {
layout_constraint_prop(elem, "preferred", Orientation::Horizontal)
if elem.borrow().layout_info_prop(Orientation::Vertical).is_none() {
match name {
"min-height" => return Some(Expression::NumberLiteral(0., Unit::Px)),
"max-height" => return Some(Expression::NumberLiteral(f32::MAX as _, Unit::Px)),
"vertical-stretch" => return Some(Expression::NumberLiteral(0., Unit::None)),
_ => {}
}
}
("opacity", _) => Expression::NumberLiteral(1., Unit::None),
("visible", _) => Expression::BoolLiteral(true),
}
let expr = match name {
"min-height" => layout_constraint_prop(elem, "min", Orientation::Vertical),
"min-width" => layout_constraint_prop(elem, "min", Orientation::Horizontal),
"max-height" => layout_constraint_prop(elem, "max", Orientation::Vertical),
"max-width" => layout_constraint_prop(elem, "max", Orientation::Horizontal),
"horizontal-stretch" => layout_constraint_prop(elem, "stretch", Orientation::Horizontal),
"vertical-stretch" => layout_constraint_prop(elem, "stretch", Orientation::Vertical),
"preferred-height" => layout_constraint_prop(elem, "preferred", Orientation::Vertical),
"preferred-width" => layout_constraint_prop(elem, "preferred", Orientation::Horizontal),
"opacity" => Expression::NumberLiteral(1., Unit::None),
"visible" => Expression::BoolLiteral(true),
_ => return None,
};
Some(expr)