diff --git a/src/core/text/build.rs b/src/core/text/build.rs index fc69cbf..bb5cab9 100644 --- a/src/core/text/build.rs +++ b/src/core/text/build.rs @@ -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 } diff --git a/src/core/text/edit.rs b/src/core/text/edit.rs index a43fd3c..c01fe5e 100644 --- a/src/core/text/edit.rs +++ b/src/core/text/edit.rs @@ -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; diff --git a/src/core/text/mod.rs b/src/core/text/mod.rs index ba7e07a..c5e9c12 100644 --- a/src/core/text/mod.rs +++ b/src/core/text/mod.rs @@ -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, 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, ); }