More refactoring for mutli components #5435
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tronical
approved these changes
Jun 19, 2024
| @@ -271,32 +271,22 @@ pub fn eval_expression(expression: &Expression, local_context: &mut EvalLocalCon | |||
| Ok(Default::default()) | |||
| } | |||
| i_slint_compiler::expression_tree::ImageReference::AbsolutePath(path) => { | |||
| corelib::graphics::Image::load_from_path(std::path::Path::new(path)) | |||
| } | |||
| i_slint_compiler::expression_tree::ImageReference::EmbeddedData { resource_id, extension } => { | |||
There was a problem hiding this comment.
It was used for builtin image (we were using EmbedResourcesKind::OnlyBuiltinResources before) I changed it to a new EmbedResourcesKind::Nothing so nothing gets "embedded".
Notice that the embedded pass does not anyway embed anything, it just means that the rust/cpp compiler will do that later. It just create resource_id which we need to map.
Since we just re-use the resource_id to get to the path (so do the inverse of the embedd_resource pass) we can just not do it, and simplify the code.
| pub async fn lower_layouts( | ||
| pub fn lower_layouts( |
Preparation for multi-components Note that this had to rename one instance of TextStyle because it conflicts with the struct of the same name used in the FontSettings in the style. This wasn't a problem before because it shares some property in common, and the the order of processing of component has changed leading to the other one being generated. (But that is a wider bug in the compiler outside of the scope of this refactoring)
ogoffart
force-pushed
the
olivier/multi-components
branch
from
31fe3aa
to
d7ff26e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.