view + a bunch of fixes or smth idek man

This commit is contained in:
2025-12-08 00:12:11 -05:00
parent b66d4da5d7
commit 434e3c3af7
18 changed files with 253 additions and 109 deletions

View File

@@ -75,7 +75,7 @@ impl TextBuilderOutput for TextOutput {
builder.attrs.line_height,
));
let hint = builder.hint.get(ui);
let font_system = &mut ui.data.text.borrow_mut().font_system;
let font_system = &mut ui.data.text.get_mut().font_system;
buf.set_text(font_system, &builder.content, &Attrs::new(), SHAPING, None);
let mut text = Text {
content: builder.content.into(),
@@ -103,7 +103,7 @@ impl TextBuilderOutput for TextEditOutput {
builder.output.single_line,
ui.data.text.clone(),
);
let font_system = &mut ui.data.text.borrow_mut().font_system;
let font_system = &mut ui.data.text.get_mut().font_system;
text.buf
.set_text(font_system, &builder.content, &Attrs::new(), SHAPING, None);
builder.attrs.apply(font_system, &mut text.buf, None);

View File

@@ -60,7 +60,7 @@ impl TextEdit {
pub fn set(&mut self, text: &str) {
let text = self.string(text);
self.view.buf.set_text(
&mut self.data.borrow_mut().font_system,
&mut self.data.get_mut().font_system,
&text,
&Attrs::new(),
SHAPING,
@@ -238,7 +238,7 @@ impl TextEdit {
self.view
.buf
.cursor_motion(
&mut self.data.borrow_mut().font_system,
&mut self.data.get_mut().font_system,
cursor,
None,
motion,

View File

@@ -67,7 +67,7 @@ impl TextView {
return tex.clone();
}
self.width = width;
let mut text_data = ctx.text.borrow_mut();
let mut text_data = ctx.text.get_mut();
self.attrs
.apply(&mut text_data.font_system, &mut self.buf, width);
self.buf
@@ -139,7 +139,7 @@ impl Text {
if self.content.changed {
self.content.changed = false;
self.view.buf.set_text(
&mut ctx.text.borrow_mut().font_system,
&mut ctx.text.get_mut().font_system,
&self.content,
&Attrs::new().family(self.view.attrs.family),
SHAPING,