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

compiler: fix materialize_fake_property for properties in base class

Browse source 
Especially for font-metrics
This commit is contained in:
Olivier Goffart 2024-12-10 16:37:08 +01:00
parent ba4b3cf5b4
commit a107462942
2 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,19 +94,8 @@ fn should_materialize(
}
let has_declared_property = match base_type {
ElementType::Component(c) => has_declared_property(&c.root_element.borrow(), prop),
ElementType::Builtin(b) => {
if let Some(p) = b.properties.get(prop) {
if b.native_class.lookup_property(prop).is_none() {
return Some(p.ty.clone());
}
true
} else {
false
}
}
ElementType::Native(n) => {
n.lookup_property(prop).map_or(false, |prop_type| prop_type.is_property_type())
}
ElementType::Builtin(b) => b.native_class.lookup_property(prop).is_some(),
ElementType::Native(n) => n.lookup_property(prop).is_some(),
ElementType::Global | ElementType::Error => false,
};
@ -122,6 +111,9 @@ fn should_materialize(
return Some(Type::Enumeration(
crate::typeregister::BUILTIN.with(|e| e.enums.PopupClosePolicy.clone()),
));
} else {
let ty = base_type.lookup_property(prop).property_type.clone();
return (ty != Type::Invalid).then_some(ty);
}
}
None
@ -135,7 +127,7 @@ fn has_declared_property(elem: &Element, prop: &str) -> bool {
}
match &elem.base_type {
ElementType::Component(c) => has_declared_property(&c.root_element.borrow(), prop),
ElementType::Builtin(b) => b.properties.contains_key(prop),
ElementType::Builtin(b) => b.native_class.lookup_property(prop).is_some(),
ElementType::Native(n) => n.lookup_property(prop).is_some(),
ElementType::Global | ElementType::Error => false,
}
@ -143,10 +135,18 @@ fn has_declared_property(elem: &Element, prop: &str) -> bool {
/// Initialize a sensible default binding for the now materialized property
pub fn initialize(elem: &ElementRc, name: &str) -> Option<Expression> {
if let ElementType::Builtin(b) = &elem.borrow().base_type {
if let Some(expr) = b.properties.get(name).and_then(|prop| prop.default_value.expr(elem)) {
return Some(expr);
}
let mut base_type = elem.borrow().base_type.clone();
loop {
base_type = match base_type {
ElementType::Component(ref c) => c.root_element.borrow().base_type.clone(),
ElementType::Builtin(b) => {
match b.properties.get(name).and_then(|prop| prop.default_value.expr(elem)) {
Some(expr) => return Some(expr),
None => break,
}
}
_ => break,
};
}
let expr = match name {

7
tests/cases/text/metrics.slint
View file

@ -1,6 +1,8 @@
// Copyright © SixtyFPS GmbH <info@slint.dev>
// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
component Text2 inherits Text {}
export component TestCase inherits Window {
width: 100phx;
height: 100phx;
@ -10,9 +12,12 @@ export component TestCase inherits Window {
stroke-width: 2px;
}
inherit-text := Text2 {}
text-input := TextInput { }
out property <bool> test: simple-text.font-metrics.ascent == complex-text.font-metrics.ascent && complex-text.font-metrics.ascent == text-input.font-metrics.ascent && text-input.font-metrics.ascent == 7px;
out property <bool> test: simple-text.font-metrics.ascent == complex-text.font-metrics.ascent && complex-text.font-metrics.ascent == text-input.font-metrics.ascent
&& inherit-text.font-metrics.ascent == simple-text.font-metrics.ascent && text-input.font-metrics.ascent == 7px;
}
/*