shadowcat/iris
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make shaping a const

Browse Source
This commit is contained in:
shadow cat
2025-11-17 21:38:40 -05:00
parent c7b255be4f
commit 7e257fd042
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/text/build.rs
View File

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

2
src/core/text/edit.rs
View File

@@ -106,7 +106,7 @@ impl<'a> TextEditCtx<'a> {
.join("\n"); .join("\n");
self.text self.text
.buf .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 { if let Some(cursor) = &mut self.text.cursor {
cursor.line = 0; cursor.line = 0;
cursor.index = 0; cursor.index = 0;

4
src/core/text/mod.rs
View File

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