language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-01 22:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Do the apply_default_properties_from_style before the lower_states pass

Browse source 
because we don't want the lowered state property to look like we set a property on it.

Also do the ensure_window before because it need to be done before to be assigned
the default color
This commit is contained in:
Olivier Goffart 2021-11-04 09:27:00 +01:00
parent 90a97cd737
commit f316c38d54
3 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

28
sixtyfps_compiler/passes.rs
View file

@ -85,6 +85,19 @@ pub async fn run_passes(
focus_item::resolve_element_reference_in_set_focus_calls(component, diag);
focus_item::determine_initial_focus_item(component, diag);
focus_item::erase_forward_focus_properties(component);
}
ensure_window::ensure_window(root_component, &doc.local_registry);
for component in (root_component.used_types.borrow().sub_components.iter())
.chain(std::iter::once(root_component))
{
apply_default_properties_from_style::apply_default_properties_from_style(
component,
&mut type_loader,
diag,
)
.await;
flickable::handle_flickable(component, &global_type_registry.borrow());
lower_states::lower_states(component, &doc.local_registry, diag);
repeater_component::process_repeater_components(component);
@ -102,18 +115,6 @@ pub async fn run_passes(
visible::handle_visible(component, &global_type_registry.borrow());
materialize_fake_properties::materialize_fake_properties(component);
}
ensure_window::ensure_window(root_component, &doc.local_registry);
for component in (root_component.used_types.borrow().sub_components.iter())
.chain(std::iter::once(root_component))
{
apply_default_properties_from_style::apply_default_properties_from_style(
component,
&mut type_loader,
diag,
)
.await;
}
collect_globals::collect_globals(&doc, diag);
let disable_inlining = match std::env::var("SIXTYFPS_DISABLE_INLINING") {
@ -137,9 +138,7 @@ pub async fn run_passes(
optimize_useless_rectangles::optimize_useless_rectangles(component);
move_declarations::move_declarations(component, diag);
remove_aliases::remove_aliases(component, diag);
resolve_native_classes::resolve_native_classes(component);
remove_unused_properties::remove_unused_properties(component);
}
@ -156,7 +155,6 @@ pub async fn run_passes(
std::iter::once(&*doc).chain(type_loader.all_documents()),
compiler_config.embed_resources,
);
root_component.is_root_component.set(true);
}

6
sixtyfps_compiler/passes/ensure_window.rs
View file

@ -18,7 +18,11 @@ use std::collections::HashSet;
use std::rc::Rc;
pub fn ensure_window(component: &Rc<Component>, type_register: &TypeRegister) {
if matches!(component.root_element.borrow().base_type.to_string().as_str(), "Window" | "Dialog")
if component
.root_element
.borrow()
.builtin_type()
.map_or(true, |b| matches!(b.name.as_str(), "Window" | "Dialog"))
{
return; // already a window, nothing to do
}