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

Simplify implementation of absolute-position

Browse source 
Since we materialize only one point property, we don't need to cache the
parent position in a separate property, but we can just store that in
the binding.
This commit is contained in:
Simon Hausmann 2023-06-21 08:19:03 +02:00 • committed by Simon Hausmann
parent 435b075dbe
commit 016d776b7d
2 changed files with 43 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

91
internal/compiler/passes/lower_absolute_coordinates.rs
View file

@ -11,7 +11,7 @@ use crate::expression_tree::{BuiltinFunction, Expression};
use crate::namedreference::NamedReference;
use crate::object_tree::{
recurse_elem_including_sub_components_no_borrow, visit_all_named_references_in_element,
Component, PropertyDeclaration,
Component,
};
pub fn lower_absolute_coordinates(component: &Rc<Component>) {
@ -25,8 +25,6 @@ pub fn lower_absolute_coordinates(component: &Rc<Component>) {
});
});
// Absolute item coordinates of the parent item.
let cached_parent_position_prop_name = "absolute-parent-position".to_string();
let point_type = match BuiltinFunction::ItemAbsolutePosition.ty() {
crate::langtype::Type::Function { return_type, .. } => return_type.as_ref().clone(),
_ => unreachable!(),
@ -35,56 +33,51 @@ pub fn lower_absolute_coordinates(component: &Rc<Component>) {
for nr in to_materialize {
let elem = nr.element();
elem.borrow_mut()
.property_declarations
.entry(cached_parent_position_prop_name.clone())
.or_insert_with(|| PropertyDeclaration {
property_type: point_type.clone(),
..PropertyDeclaration::default()
});
// Create a binding for the `absolute-position` property. The
// materialize properties pass is going to create the actual property later.
if !elem.borrow().bindings.contains_key(&cached_parent_position_prop_name) {
let point_binding = Expression::FunctionCall {
function: Box::new(Expression::BuiltinFunctionReference(
BuiltinFunction::ItemAbsolutePosition,
None,
)),
arguments: vec![Expression::ElementReference(Rc::downgrade(&elem))],
source_location: None,
};
elem.borrow_mut().bindings.insert(
cached_parent_position_prop_name.clone(),
RefCell::new(point_binding.into()),
);
}
// Create a binding to the hidden point property and add item local x/y. The
// materialize properties pass is going to create the actual property for
// absolute-position.
let binding = Expression::Struct {
let parent_position_var = Box::new(Expression::ReadLocalVariable {
name: "parent_position".into(),
ty: point_type.clone(),
values: IntoIterator::into_iter(["x", "y"])
.map(|coord| {
(
coord.to_string(),
Expression::BinaryExpression {
lhs: Expression::StructFieldAccess {
base: Expression::PropertyReference(NamedReference::new(
&elem,
&cached_parent_position_prop_name,
});
let binding = Expression::CodeBlock(vec![
Expression::StoreLocalVariable {
name: "parent_position".into(),
value: Expression::FunctionCall {
function: Box::new(Expression::BuiltinFunctionReference(
BuiltinFunction::ItemAbsolutePosition,
None,
)),
arguments: vec![Expression::ElementReference(Rc::downgrade(&elem))],
source_location: None,
}
.into(),
},
Expression::Struct {
ty: point_type.clone(),
values: IntoIterator::into_iter(["x", "y"])
.map(|coord| {
(
coord.to_string(),
Expression::BinaryExpression {
lhs: Expression::StructFieldAccess {
base: parent_position_var.clone(),
name: coord.to_string(),
}
.into(),
rhs: Expression::PropertyReference(NamedReference::new(
&elem, &coord,
))
.into(),
name: coord.to_string(),
}
.into(),
rhs: Expression::PropertyReference(NamedReference::new(&elem, &coord))
.into(),
op: '+',
},
)
})
.collect(),
};
op: '+',
},
)
})
.collect(),
},
]);
elem.borrow_mut().bindings.insert(nr.name().to_string(), RefCell::new(binding.into()));
}
}

3
internal/compiler/tests/syntax/analysis/binding_loop_mappointtowindow.slint
View file

@ -7,8 +7,7 @@ export App := Rectangle {
x: inner.absolute-position.x > 10px ? 10px : 0px;
// ^error{The binding for the property 'x' is part of a binding loop}
inner := Rectangle {
// ^error{The binding for the property 'absolute-parent-position' is part of a binding loop}
// ^^error{The binding for the property 'absolute-position' is part of a binding loop}
// ^error{The binding for the property 'absolute-position' is part of a binding loop}
}
}