fix for test.sh

This commit is contained in:
Stewart Connor 2025-03-31 17:03:51 +11:00
parent 53763c157b
commit e828131c92
15 changed files with 136 additions and 109 deletions

View file

@ -36,7 +36,7 @@ impl Default for DrawTestCfg {
let font = Attrs::new().family(Family::Serif);
Self {
name: "default".into(),
font: AttrsOwned::new(font),
font: AttrsOwned::new(&font),
text: "".into(),
font_size: 16.0,
line_height: 20.0,
@ -60,7 +60,7 @@ impl DrawTestCfg {
}
pub fn font_attrs(mut self, attrs: Attrs) -> Self {
self.font = AttrsOwned::new(attrs);
self.font = AttrsOwned::new(&attrs);
self
}
@ -92,7 +92,7 @@ impl DrawTestCfg {
Some((self.canvas_width - margins * 2) as f32),
Some((self.canvas_height - margins * 2) as f32),
);
buffer.set_text(&self.text, self.font.as_attrs(), Shaping::Advanced);
buffer.set_text(&self.text, &self.font.as_attrs(), Shaping::Advanced);
buffer.shape_until_scroll(true);
// Black

View file

@ -11,7 +11,7 @@ use cosmic_text::{
fn stable_wrap() {
let font_size = 18.0;
let attrs = AttrsList::new(
Attrs::new()
&Attrs::new()
.family(Family::Name("FiraMono"))
.weight(Weight::MEDIUM),
);
@ -105,7 +105,7 @@ fn wrap_extra_line() {
// Add some text!
buffer.set_wrap(Wrap::Word);
buffer.set_text("Lorem ipsum dolor sit amet, qui minim labore adipisicing\n\nweeewoooo minim sint cillum sint consectetur cupidatat.", Attrs::new().family(cosmic_text::Family::Name("Inter")), Shaping::Advanced);
buffer.set_text("Lorem ipsum dolor sit amet, qui minim labore adipisicing\n\nweeewoooo minim sint cillum sint consectetur cupidatat.", &Attrs::new().family(cosmic_text::Family::Name("Inter")), Shaping::Advanced);
// Set a size for the text buffer, in pixels
buffer.set_size(Some(50.0), Some(1000.0));

View file

@ -15,7 +15,7 @@ fn wrap_word_fallback() {
let mut buffer = buffer.borrow_with(&mut font_system);
buffer.set_wrap(Wrap::WordOrGlyph);
buffer.set_text("Lorem ipsum dolor sit amet, qui minim labore adipisicing minim sint cillum sint consectetur cupidatat.", Attrs::new().family(cosmic_text::Family::Name("Inter")), Shaping::Advanced);
buffer.set_text("Lorem ipsum dolor sit amet, qui minim labore adipisicing minim sint cillum sint consectetur cupidatat.", &Attrs::new().family(cosmic_text::Family::Name("Inter")), Shaping::Advanced);
buffer.set_size(Some(50.0), Some(1000.0));
buffer.shape_until_scroll(false);