Implement more things

Author: expenses

internal/compiler/builtin_macros.rs

@@ -341,7 +341,12 @@ fn to_debug_string(
         Type::Float32 | Type::Int32 => expr.maybe_convert_to(Type::String, node, diag),
         Type::String => expr,
         // TODO
-        Type::Color | Type::Brush | Type::Image | Type::Easing | Type::Array(_) => {
+        Type::Color
+        | Type::Brush
+        | Type::Image
+        | Type::Easing
+        | Type::StyledText
+        | Type::Array(_) => {
             Expression::StringLiteral("<debug-of-this-type-not-yet-implemented>".into())
         }
         Type::Duration
@@ -418,7 +423,6 @@ fn to_debug_string(
             }
         }
         Type::Enumeration(_) => Expression::Cast { from: Box::new(expr), to: (Type::String) },
-        Type::StyledText => Expression::Invalid,
     }
 }
 

internal/compiler/builtins.slint

@@ -131,7 +131,6 @@ export component MarkdownText inherits Empty {
     in property <TextVerticalAlignment> vertical-alignment;
     callback link-clicked(link: string);
     in property <color> link-color: #00f;
-
     in property <string> font-family;
     in property <bool> font-italic;
     in property <TextOverflow> overflow;
@@ -143,6 +142,10 @@ export component MarkdownText inherits Empty {
     //-default_size_binding:implicit_size
 }
 
+export component StyledText inherits Empty {
+    in property <styled-text> text;
+}
+
 export component TouchArea {
     in property <bool> enabled: true;
     out property <bool> pressed;

internal/compiler/generator/rust.rs

@@ -91,6 +91,7 @@ pub fn rust_primitive_type(ty: &Type) -> Option<proc_macro2::TokenStream> {
         Type::Percent => Some(quote!(f32)),
         Type::Bool => Some(quote!(bool)),
         Type::Image => Some(quote!(sp::Image)),
+        Type::StyledText => Some(quote!(sp::StyledText)),
         Type::Struct(s) => {
             if let Some(name) = &s.name {
                 Some(struct_name_to_tokens(name))

internal/compiler/typeregister.rs

@@ -402,6 +402,7 @@ impl TypeRegister {
         register.insert_type(Type::Angle);
         register.insert_type(Type::Brush);
         register.insert_type(Type::Rem);
+        register.insert_type(Type::StyledText);
         register.types.insert("Point".into(), logical_point_type().into());
 
         BUILTIN.with(|e| e.enums.fill_register(&mut register));

internal/core/api.rs

@@ -1219,3 +1219,8 @@ pub fn set_xdg_app_id(app_id: impl Into<SharedString>) -> Result<(), PlatformErr
         |ctx| ctx.set_xdg_app_id(app_id.into()),
     )
 }
+
+#[derive(Debug, PartialEq, Clone, Default)]
+pub struct StyledText {
+    inner: (),
+}

internal/interpreter/api.rs

@@ -129,7 +129,7 @@ pub enum Value {
     #[doc(hidden)]
     /// Correspond to the `component-factory` type in .slint
     ComponentFactory(ComponentFactory) = 12,
-    StyledText(()) = 13,
+    StyledText(StyledText) = 13,
 }
 
 impl Value {
@@ -245,6 +245,7 @@ declare_value_conversion!(PathData => [PathData]);
 declare_value_conversion!(EasingCurve => [i_slint_core::animations::EasingCurve]);
 declare_value_conversion!(LayoutCache => [SharedVector<f32>] );
 declare_value_conversion!(ComponentFactory => [ComponentFactory] );
+declare_value_conversion!(StyledText => [StyledText] );
 
 /// Implement From / TryFrom for Value that convert a `struct` to/from `Value::Struct`
 macro_rules! declare_value_struct_conversion {

internal/interpreter/dynamic_item_tree.rs

@@ -14,7 +14,7 @@ use i_slint_compiler::{generator, object_tree, parser, CompilerConfiguration};
 use i_slint_core::accessibility::{
     AccessibilityAction, AccessibleStringProperty, SupportedAccessibilityAction,
 };
-use i_slint_core::api::LogicalPosition;
+use i_slint_core::api::{LogicalPosition, StyledText};
 use i_slint_core::component_factory::ComponentFactory;
 use i_slint_core::item_tree::{
     IndexRange, ItemRc, ItemTree, ItemTreeNode, ItemTreeRef, ItemTreeRefPin, ItemTreeVTable,
@@ -1253,7 +1253,7 @@ pub(crate) fn generate_item_tree<'id>(
             }
             Type::LayoutCache => property_info::<SharedVector<f32>>(),
             Type::Function { .. } | Type::Callback { .. } => return None,
-            Type::StyledText => property_info::<Value>(),
+            Type::StyledText => property_info::<StyledText>(),
             // These can't be used in properties
             Type::Invalid
             | Type::Void