fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-10-01 09:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename various symbols and text in layout_system.rs

Browse Source
This commit is contained in:
Keavon Chambers
2020-11-01 01:44:33 -07:00
parent 52ba3d9b6d
commit 24b79d7e97
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/layout_system.rs
+14 -16
View File
@@ -29,10 +29,8 @@ impl<'a> LayoutSystem<'a> {
self.preload_component(name) self.preload_component(name)
.expect(&format!("Failure loading layout component '{}'", Self::component_name(name))[..]); .expect(&format!("Failure loading layout component '{}'", Self::component_name(name))[..]);
// Get the now-loaded component // Get the now-loaded component's namespace:name
let window_root_component_name = Self::component_name(name); let window_root_component_name = Self::component_name(name);
// let window_root_component = self.loaded_components.get(&window_root_component_name[..]).unwrap();
// println!("FC: {:#?}", window_root_component);
// Construct the window and save it // Construct the window and save it
let new_window = WindowDom::new(&window_root_component_name[..], (1920, 1080), &self.loaded_components); let new_window = WindowDom::new(&window_root_component_name[..], (1920, 1080), &self.loaded_components);
@@ -67,10 +65,10 @@ impl<'a> LayoutSystem<'a> {
self.explore_component_tag(child_tag, already_loaded_layouts); self.explore_component_tag(child_tag, already_loaded_layouts);
} }
// Go through each parameter attribute and preload any default values of layouts // Go through each prop definition and preload any default values of layouts
for definition in &component.own_info.parameters { for definition in &component.own_info.prop_definitions {
for default in definition.type_sequence_default.iter() { for default in definition.type_sequence_default.iter() {
if let TypeValue::Layout(layouts) = default { if let TypedValue::Layout(layouts) = default {
for layout in layouts { for layout in layouts {
match &*layout.borrow() { match &*layout.borrow() {
LayoutComponentNode::Tag(tag) => self.explore_component_tag(tag, already_loaded_layouts), LayoutComponentNode::Tag(tag) => self.explore_component_tag(tag, already_loaded_layouts),
@@ -84,7 +82,7 @@ impl<'a> LayoutSystem<'a> {
/// Preload and cache every XML component file referenced by tags within a recursive traversal of descendants in the given component tag /// Preload and cache every XML component file referenced by tags within a recursive traversal of descendants in the given component tag
fn explore_component_tag(&mut self, tag: &LayoutComponentTag, already_loaded_layouts: &mut HashSet<String>) { fn explore_component_tag(&mut self, tag: &LayoutComponentTag, already_loaded_layouts: &mut HashSet<String>) {
// Determine the cache key of form "namespace:name" // Determine the cache key of form namespace:name
let (name, namespace) = &tag.name; let (name, namespace) = &tag.name;
let key = Self::component_name((&name[..], &namespace[..])); let key = Self::component_name((&name[..], &namespace[..]));
@@ -105,10 +103,10 @@ impl<'a> LayoutSystem<'a> {
self.loaded_components.set(&key_copy[..], component); self.loaded_components.set(&key_copy[..], component);
} }
// Expore the Layout-type user attribute argument values // Expore the props with values of type Layout
for argument in &tag.user_arguments { for argument in &tag.props {
for value in &argument.value { for value in &argument.value_sequence {
if let TypeValueOrArgument::TypeValue(TypeValue::Layout(layouts)) = value { if let TypedValueOrVariableName::TypedValue(TypedValue::Layout(layouts)) = value {
for layout in layouts { for layout in layouts {
match &*layout.borrow() { match &*layout.borrow() {
LayoutComponentNode::Tag(component_tag) => self.explore_component_tag(component_tag, already_loaded_layouts), LayoutComponentNode::Tag(component_tag) => self.explore_component_tag(component_tag, already_loaded_layouts),
@@ -246,15 +244,15 @@ impl<'a> LayoutSystem<'a> {
// Add the new attribute to the current yet-to-be-closed element // Add the new attribute to the current yet-to-be-closed element
match &mut current_opening_tag { match &mut current_opening_tag {
// Add this attribute as a parameter to the current root-level component definition tag // Add this attribute as a definition of a prop to the current root-level component definition tag
Some(LayoutComponentNodeOrDefinition::LayoutComponentDefinition(definition)) => { Some(LayoutComponentNodeOrDefinition::LayoutComponentDefinition(definition)) => {
let parsed_parameter = attribute_parser.parse_attribute_parameter_declaration(value); let prop_definition = attribute_parser.parse_attribute_prop_definition(value);
definition.add_parameter(parsed_parameter); definition.add_prop_definition(prop_definition);
}, },
// Add this attribute as an argument to the current tag // Add this attribute as a prop to the current tag
Some(LayoutComponentNodeOrDefinition::LayoutComponentNode(LayoutComponentNode::Tag(tag))) => { Some(LayoutComponentNodeOrDefinition::LayoutComponentNode(LayoutComponentNode::Tag(tag))) => {
let parsed_attributes = attribute_parser.parse_attribute_argument_types(value); let parsed_attributes = attribute_parser.parse_attribute_argument_types(value);
let attribute_argument = AttributeArg::new(name, parsed_attributes); let attribute_argument = Prop::new(name, parsed_attributes);
tag.add_attribute(attribute_argument); tag.add_attribute(attribute_argument);
}, },
// It should be impossible to add an attribute when there is no opening tag in progress // It should be impossible to add an attribute when there is no opening tag in progress