leyoda/cosmic-terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: updates for new cosmic-text

Browse source
This commit is contained in:
Hojjat 2026-04-01 16:29:37 -06:00
parent 8ae5918ccd
commit fd99bb9b55
2 changed files with 395 additions and 606 deletions
Download patch file Download diff file Expand all files Collapse all files

982
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

19
src/terminal.rs
View file

@ -303,13 +303,13 @@ impl Terminal {
let (cell_width, cell_height) = { let (cell_width, cell_height) = {
let mut font_system = font_system().write().unwrap(); let mut font_system = font_system().write().unwrap();
let font_system = font_system.raw(); let font_system = font_system.raw();
buffer.set_wrap(font_system, Wrap::None); buffer.set_wrap(Wrap::None);
// Use size of space to determine cell size // Use size of space to determine cell size
buffer.set_text(font_system, " ", &default_attrs, Shaping::Advanced, None); buffer.set_text(" ", &default_attrs, Shaping::Advanced, None);
let layout = buffer.line_layout(font_system, 0).unwrap(); let layout = buffer.line_layout(font_system, 0).unwrap();
let w = layout[0].w; let w = layout[0].w;
buffer.set_monospace_width(font_system, Some(w)); buffer.set_monospace_width(Some(w));
(w, metrics.line_height) (w, metrics.line_height)
}; };
@ -448,8 +448,7 @@ impl Terminal {
self.term.lock().resize(self.size); self.term.lock().resize(self.size);
self.with_buffer_mut(|buffer| { self.with_buffer_mut(|buffer| {
let mut font_system = font_system().write().unwrap(); buffer.set_size(Some(width as f32), Some(height as f32));
buffer.set_size(font_system.raw(), Some(width as f32), Some(height as f32));
}); });
self.needs_update = true; self.needs_update = true;
@ -632,10 +631,7 @@ impl Terminal {
let metrics = config.metrics(zoom_adj); let metrics = config.metrics(zoom_adj);
if metrics != self.buffer.metrics() { if metrics != self.buffer.metrics() {
{ self.with_buffer_mut(|buffer| buffer.set_metrics(metrics));
let mut font_system = font_system().write().unwrap();
self.with_buffer_mut(|buffer| buffer.set_metrics(font_system.raw(), metrics));
}
update_cell_size = true; update_cell_size = true;
} }
@ -692,11 +688,10 @@ impl Terminal {
let (cell_width, cell_height) = { let (cell_width, cell_height) = {
let mut font_system = font_system().write().unwrap(); let mut font_system = font_system().write().unwrap();
self.with_buffer_mut(|buffer| { self.with_buffer_mut(|buffer| {
buffer.set_wrap(font_system.raw(), Wrap::None); buffer.set_wrap(Wrap::None);
// Use size of space to determine cell size // Use size of space to determine cell size
buffer.set_text( buffer.set_text(
font_system.raw(),
" ", " ",
&default_attrs, &default_attrs,
Shaping::Advanced, Shaping::Advanced,
@ -704,7 +699,7 @@ impl Terminal {
); );
let layout = buffer.line_layout(font_system.raw(), 0).unwrap(); let layout = buffer.line_layout(font_system.raw(), 0).unwrap();
let w = layout[0].w; let w = layout[0].w;
buffer.set_monospace_width(font_system.raw(), Some(w)); buffer.set_monospace_width(Some(w));
(w, buffer.metrics().line_height) (w, buffer.metrics().line_height)
}) })
}; };