switch to element defined span lens + better size fn
This commit is contained in:
@@ -64,6 +64,7 @@ impl TextBuilderOutput for TextOutput {
|
||||
&builder.content,
|
||||
&Attrs::new(),
|
||||
Shaping::Advanced,
|
||||
None,
|
||||
);
|
||||
let mut text = Text {
|
||||
content: builder.content.into(),
|
||||
@@ -94,6 +95,7 @@ impl TextBuilderOutput for TextEditOutput {
|
||||
&builder.content,
|
||||
&Attrs::new(),
|
||||
Shaping::Advanced,
|
||||
None,
|
||||
);
|
||||
builder.attrs.apply(font_system, &mut text.buf, None);
|
||||
text
|
||||
|
||||
@@ -41,8 +41,8 @@ impl Widget for TextEdit {
|
||||
}
|
||||
}
|
||||
|
||||
fn desired_size(&mut self, ctx: &mut SizeCtx) -> UiVec2 {
|
||||
UiVec2::abs(self.view.draw(ctx).size())
|
||||
fn desired_size(&mut self, ctx: &mut SizeCtx) -> Size {
|
||||
Size::abs(self.view.draw(ctx).size())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -96,7 +96,7 @@ impl<'a> TextEditCtx<'a> {
|
||||
.join("\n");
|
||||
self.text
|
||||
.buf
|
||||
.set_text(self.font_system, "", &Attrs::new(), Shaping::Advanced);
|
||||
.set_text(self.font_system, "", &Attrs::new(), Shaping::Advanced, None);
|
||||
if let Some(cursor) = &mut self.text.cursor {
|
||||
cursor.line = 0;
|
||||
cursor.index = 0;
|
||||
|
||||
@@ -75,6 +75,7 @@ impl Text {
|
||||
&self.content,
|
||||
&Attrs::new().family(self.view.attrs.family),
|
||||
Shaping::Advanced,
|
||||
None,
|
||||
);
|
||||
}
|
||||
self.view.draw(ctx)
|
||||
@@ -88,8 +89,8 @@ impl Widget for Text {
|
||||
painter.texture_within(&tex.handle, region);
|
||||
}
|
||||
|
||||
fn desired_size(&mut self, ctx: &mut SizeCtx) -> UiVec2 {
|
||||
UiVec2::abs(self.update_buf(ctx).size())
|
||||
fn desired_size(&mut self, ctx: &mut SizeCtx) -> Size {
|
||||
Size::abs(self.update_buf(ctx).size())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user