make shaping a const

This commit is contained in:
2025-11-17 21:38:40 -05:00
parent c7b255be4f
commit 7e257fd042
3 changed files with 7 additions and 16 deletions

View File

@@ -59,13 +59,7 @@ impl TextBuilderOutput for TextOutput {
builder.attrs.line_height,
));
let font_system = &mut ui.data.text.font_system;
buf.set_text(
font_system,
&builder.content,
&Attrs::new(),
Shaping::Advanced,
None,
);
buf.set_text(font_system, &builder.content, &Attrs::new(), SHAPING, None);
let mut text = Text {
content: builder.content.into(),
view: TextView::new(buf, builder.attrs),
@@ -90,13 +84,8 @@ impl TextBuilderOutput for TextEditOutput {
cursor: None,
};
let font_system = &mut ui.data.text.font_system;
text.buf.set_text(
font_system,
&builder.content,
&Attrs::new(),
Shaping::Advanced,
None,
);
text.buf
.set_text(font_system, &builder.content, &Attrs::new(), SHAPING, None);
builder.attrs.apply(font_system, &mut text.buf, None);
text
}

View File

@@ -106,7 +106,7 @@ impl<'a> TextEditCtx<'a> {
.join("\n");
self.text
.buf
.set_text(self.font_system, "", &Attrs::new(), Shaping::Advanced, None);
.set_text(self.font_system, "", &Attrs::new(), SHAPING, None);
if let Some(cursor) = &mut self.text.cursor {
cursor.line = 0;
cursor.index = 0;

View File

@@ -8,6 +8,8 @@ use crate::{prelude::*, util::MutDetect};
use cosmic_text::{Attrs, Metrics, Shaping};
use std::ops::{Deref, DerefMut};
pub const SHAPING: Shaping = Shaping::Advanced;
pub struct Text {
pub content: MutDetect<String>,
view: TextView,
@@ -74,7 +76,7 @@ impl Text {
&mut ctx.text.font_system,
&self.content,
&Attrs::new().family(self.view.attrs.family),
Shaping::Advanced,
SHAPING,
None,
);
}