Skip to content

Commit 8a9bfcf

Browse files
committed
Rename to StyledTextItem
1 parent c35913a commit 8a9bfcf

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

api/cpp/cbindgen.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ fn gen_corelib(
305305
"Flickable",
306306
"SimpleText",
307307
"ComplexText",
308-
"StyledText",
308+
"StyledTextItem",
309309
"Path",
310310
"WindowItem",
311311
"TextInput",

internal/compiler/builtins.slint

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ component ComplexText inherits SimpleText {
120120

121121
export { ComplexText as Text }
122122

123-
export component StyledText inherits Empty {
123+
component StyledTextItem inherits Empty {
124124
in property <length> width;
125125
in property <length> height;
126126
in property <styled-text> text;
@@ -143,6 +143,8 @@ export component StyledText inherits Empty {
143143
//-default_size_binding:implicit_size
144144
}
145145

146+
export { StyledTextItem as StyledText }
147+
146148
export component TouchArea {
147149
in property <bool> enabled: true;
148150
out property <bool> pressed;

internal/core/items.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1729,7 +1729,7 @@ declare_item_vtable! {
17291729
}
17301730

17311731
declare_item_vtable! {
1732-
fn slint_get_StyledTextVTable() -> StyledTextVTable for StyledText
1732+
fn slint_get_StyledTextItemVTable() -> StyledTextItemVTable for StyledTextItem
17331733
}
17341734

17351735
declare_item_vtable! {

internal/core/items/text.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ impl ComplexText {
228228
#[repr(C)]
229229
#[derive(FieldOffsets, Default, SlintElement)]
230230
#[pin]
231-
pub struct StyledText {
231+
pub struct StyledTextItem {
232232
pub width: Property<LogicalLength>,
233233
pub height: Property<LogicalLength>,
234234
pub text: Property<api::StyledText>,
@@ -251,7 +251,7 @@ pub struct StyledText {
251251
pub cached_rendering_data: CachedRenderingData,
252252
}
253253

254-
impl Item for StyledText {
254+
impl Item for StyledTextItem {
255255
fn init(self: Pin<&Self>, _self_rc: &ItemRc) {}
256256

257257
fn layout_info(
@@ -371,14 +371,14 @@ impl Item for StyledText {
371371
}
372372
}
373373

374-
impl ItemConsts for StyledText {
374+
impl ItemConsts for StyledTextItem {
375375
const cached_rendering_data_offset: const_field_offset::FieldOffset<
376-
StyledText,
376+
StyledTextItem,
377377
CachedRenderingData,
378-
> = StyledText::FIELD_OFFSETS.cached_rendering_data.as_unpinned_projection();
378+
> = StyledTextItem::FIELD_OFFSETS.cached_rendering_data.as_unpinned_projection();
379379
}
380380

381-
impl HasFont for StyledText {
381+
impl HasFont for StyledTextItem {
382382
fn font_request(self: Pin<&Self>, self_rc: &crate::items::ItemRc) -> FontRequest {
383383
crate::items::WindowItem::resolved_font_request(
384384
self_rc,
@@ -391,13 +391,13 @@ impl HasFont for StyledText {
391391
}
392392
}
393393

394-
impl RenderString for StyledText {
394+
impl RenderString for StyledTextItem {
395395
fn text(self: Pin<&Self>) -> PlainOrStyledText {
396396
PlainOrStyledText::Styled(self.text())
397397
}
398398
}
399399

400-
impl RenderText for StyledText {
400+
impl RenderText for StyledTextItem {
401401
fn target_size(self: Pin<&Self>) -> LogicalSize {
402402
LogicalSize::from_lengths(self.width(), self.height())
403403
}
@@ -433,7 +433,7 @@ impl RenderText for StyledText {
433433
}
434434
}
435435

436-
impl StyledText {
436+
impl StyledTextItem {
437437
pub fn font_metrics(
438438
self: Pin<&Self>,
439439
window_adapter: &Rc<dyn WindowAdapter>,

internal/interpreter/dynamic_item_tree.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ fn generate_rtti() -> HashMap<&'static str, Rc<ItemRTTI>> {
986986
rtti_for::<ImageItem>(),
987987
rtti_for::<ClippedImage>(),
988988
rtti_for::<ComplexText>(),
989-
rtti_for::<StyledText>(),
989+
rtti_for::<StyledTextItem>(),
990990
rtti_for::<SimpleText>(),
991991
rtti_for::<Rectangle>(),
992992
rtti_for::<BasicBorderRectangle>(),

0 commit comments

Comments
 (0)