Rename MarkdownText to StyledText

Author: expenses

api/cpp/cbindgen.rs

@@ -305,7 +305,7 @@ fn gen_corelib(
         "Flickable",
         "SimpleText",
         "ComplexText",
-        "MarkdownText",
+        "StyledText",
         "Path",
         "WindowItem",
         "TextInput",

internal/compiler/builtins.slint

@@ -120,10 +120,10 @@ component ComplexText inherits SimpleText {
 
 export { ComplexText as Text }
 
-export component MarkdownText inherits Empty {
+export component StyledText inherits Empty {
     in property <length> width;
     in property <length> height;
-    in property <string> text;
+    in property <styled-text> text;
     in property <length> font-size;
     in property <int> font-weight;
     in property <brush> color;
@@ -142,10 +142,6 @@ 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/passes/apply_default_properties_from_style.rs

@@ -62,7 +62,7 @@ pub fn apply_default_properties_from_style(
                         }
                     });
                 }
-                "Text" | "MarkdownText" => {
+                "Text" | "StyledText" => {
                     elem.set_binding_if_not_set("color".into(), || Expression::Cast {
                         from: Expression::PropertyReference(NamedReference::new(
                             &palette.root_element,

internal/compiler/passes/embed_glyphs.rs

@@ -546,7 +546,7 @@ pub fn collect_font_sizes_used(
         .to_string()
         .as_str()
     {
-        "TextInput" | "Text" | "SimpleText" | "ComplexText" | "MarkdownText" => {
+        "TextInput" | "Text" | "SimpleText" | "ComplexText" | "StyledText" => {
             if let Some(font_size) = try_extract_font_size_from_element(elem, "font-size") {
                 add_font_size(font_size)
             }

internal/compiler/typeregister.rs

@@ -587,7 +587,7 @@ impl TypeRegister {
         register.elements.remove("DropArea").unwrap();
         register.types.remove("DropEvent").unwrap(); // Also removed in xtask/src/slintdocs.rs
 
-        register.elements.remove("MarkdownText").unwrap();
+        register.elements.remove("StyledText").unwrap();
 
         Rc::new(RefCell::new(register))
     }

internal/core/items.rs

@@ -1729,7 +1729,7 @@ declare_item_vtable! {
 }
 
 declare_item_vtable! {
-    fn slint_get_MarkdownTextVTable() -> MarkdownTextVTable for MarkdownText
+    fn slint_get_StyledTextVTable() -> StyledTextVTable for StyledText
 }
 
 declare_item_vtable! {

internal/core/items/text.rs

@@ -13,6 +13,7 @@ use super::{
     TextHorizontalAlignment, TextOverflow, TextStrokeStyle, TextVerticalAlignment, TextWrap,
     VoidArg, WindowItem,
 };
+use crate::api;
 use crate::graphics::{Brush, Color, FontRequest};
 use crate::input::{
     FocusEvent, FocusEventResult, FocusReason, InputEventFilterResult, InputEventResult, KeyEvent,
@@ -225,10 +226,10 @@ impl ComplexText {
 #[repr(C)]
 #[derive(FieldOffsets, Default, SlintElement)]
 #[pin]
-pub struct MarkdownText {
+pub struct StyledText {
     pub width: Property<LogicalLength>,
     pub height: Property<LogicalLength>,
-    pub text: Property<SharedString>,
+    pub text: Property<api::StyledText>,
     pub font_size: Property<LogicalLength>,
     pub font_weight: Property<i32>,
     pub color: Property<Brush>,
@@ -248,7 +249,7 @@ pub struct MarkdownText {
     pub cached_rendering_data: CachedRenderingData,
 }
 
-impl Item for MarkdownText {
+impl Item for StyledText {
     fn init(self: Pin<&Self>, _self_rc: &ItemRc) {}
 
     fn layout_info(
@@ -368,14 +369,14 @@ impl Item for MarkdownText {
     }
 }
 
-impl ItemConsts for MarkdownText {
+impl ItemConsts for StyledText {
     const cached_rendering_data_offset: const_field_offset::FieldOffset<
-        MarkdownText,
+        StyledText,
         CachedRenderingData,
-    > = MarkdownText::FIELD_OFFSETS.cached_rendering_data.as_unpinned_projection();
+    > = StyledText::FIELD_OFFSETS.cached_rendering_data.as_unpinned_projection();
 }
 
-impl HasFont for MarkdownText {
+impl HasFont for StyledText {
     fn font_request(self: Pin<&Self>, self_rc: &crate::items::ItemRc) -> FontRequest {
         crate::items::WindowItem::resolved_font_request(
             self_rc,
@@ -388,13 +389,13 @@ impl HasFont for MarkdownText {
     }
 }
 
-impl RenderString for MarkdownText {
+impl RenderString for StyledText {
     fn text(self: Pin<&Self>) -> SharedString {
-        self.text()
+        panic!()
     }
 }
 
-impl RenderText for MarkdownText {
+impl RenderText for StyledText {
     fn target_size(self: Pin<&Self>) -> LogicalSize {
         LogicalSize::from_lengths(self.width(), self.height())
     }
@@ -430,7 +431,7 @@ impl RenderText for MarkdownText {
     }
 }
 
-impl MarkdownText {
+impl StyledText {
     pub fn font_metrics(
         self: Pin<&Self>,
         window_adapter: &Rc<dyn WindowAdapter>,

internal/core/rtti.rs

@@ -54,6 +54,7 @@ macro_rules! declare_ValueType_2 {
             crate::items::MenuEntry,
             crate::items::DropEvent,
             crate::model::ModelRc<crate::items::MenuEntry>,
+            crate::api::StyledText,
             $(crate::items::$Name,)*
         ];
     };

internal/interpreter/api.rs

@@ -18,8 +18,10 @@ use std::rc::Rc;
 
 #[doc(inline)]
 pub use i_slint_compiler::diagnostics::{Diagnostic, DiagnosticLevel};
-
-pub use i_slint_core::api::*;
+pub use i_slint_core::api::{
+    self, ComponentHandle, EventLoopError, Global, JoinHandle, PlatformError, SharedString, Weak,
+    Window,
+};
 // keep in sync with api/rs/slint/lib.rs
 pub use i_slint_backend_selector::api::*;
 pub use i_slint_core::graphics::{
@@ -129,7 +131,7 @@ pub enum Value {
     #[doc(hidden)]
     /// Correspond to the `component-factory` type in .slint
     ComponentFactory(ComponentFactory) = 12,
-    StyledText(StyledText) = 13,
+    StyledText(api::StyledText) = 13,
 }
 
 impl Value {
@@ -245,7 +247,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] );
+declare_value_conversion!(StyledText => [api::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

@@ -982,7 +982,7 @@ fn generate_rtti() -> HashMap<&'static str, Rc<ItemRTTI>> {
             rtti_for::<ImageItem>(),
             rtti_for::<ClippedImage>(),
             rtti_for::<ComplexText>(),
-            rtti_for::<MarkdownText>(),
+            rtti_for::<StyledText>(),
             rtti_for::<SimpleText>(),
             rtti_for::<Rectangle>(),
             rtti_for::<BasicBorderRectangle>(),