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

Update dependencies

Browse source
This commit is contained in:
Jeremy Soller 2025-03-31 09:27:28 -06:00
parent a4dd9ab142
commit d3b9ac6c75
No known key found for this signature in database
GPG key ID: 670FDFB5428E05CA
2 changed files with 198 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/terminal.rs
View file

@ -303,7 +303,7 @@ impl Terminal {
buffer.set_wrap(font_system, Wrap::None);
// Use size of space to determine cell size
buffer.set_text(font_system, " ", default_attrs, Shaping::Advanced);
buffer.set_text(font_system, " ", &default_attrs, Shaping::Advanced);
let layout = buffer.line_layout(font_system, 0).unwrap();
let w = layout[0].w;
buffer.set_monospace_width(font_system, Some(w));
@ -591,12 +591,18 @@ impl Terminal {
let mut update = false;
let zoom_adj = self.zoom_adj;
if self.default_attrs.stretch != config.typed_font_stretch() {
self.default_attrs = self.default_attrs.stretch(config.typed_font_stretch());
self.default_attrs = self
.default_attrs
.clone()
.stretch(config.typed_font_stretch());
update_cell_size = true;
}
if self.default_attrs.weight.0 != config.font_weight {
self.default_attrs = self.default_attrs.weight(Weight(config.font_weight));
self.default_attrs = self
.default_attrs
.clone()
.weight(Weight(config.font_weight));
update_cell_size = true;
}
@ -673,14 +679,14 @@ impl Terminal {
}
pub fn update_cell_size(&mut self) {
let default_attrs = self.default_attrs;
let default_attrs = self.default_attrs.clone();
let (cell_width, cell_height) = {
let mut font_system = font_system().write().unwrap();
self.with_buffer_mut(|buffer| {
buffer.set_wrap(font_system.raw(), Wrap::None);
// Use size of space to determine cell size
buffer.set_text(font_system.raw(), " ", default_attrs, Shaping::Advanced);
buffer.set_text(font_system.raw(), " ", &default_attrs, Shaping::Advanced);
let layout = buffer.line_layout(font_system.raw(), 0).unwrap();
let w = layout[0].w;
buffer.set_monospace_width(font_system.raw(), Some(w));
@ -720,7 +726,7 @@ impl Terminal {
let mut line_i = 0;
let mut last_point = None;
let mut text = String::from(LRI);
let mut attrs_list = AttrsList::new(self.default_attrs);
let mut attrs_list = AttrsList::new(&self.default_attrs);
{
let mut term = self.term.lock();
//TODO: use damage?
@ -747,7 +753,7 @@ impl Terminal {
buffer.lines.push(BufferLine::new(
"",
LineEnding::default(),
AttrsList::new(self.default_attrs),
AttrsList::new(&self.default_attrs),
Shaping::Advanced,
));
buffer.set_redraw(true);
@ -787,7 +793,7 @@ impl Terminal {
}
let end = text.len();
let mut attrs = self.default_attrs;
let mut attrs = self.default_attrs.clone();
let cell_fg = if indexed.cell.flags.contains(Flags::DIM) {
as_dim(indexed.cell.fg)
@ -891,7 +897,7 @@ impl Terminal {
attrs = attrs.cache_key_flags(CacheKeyFlags::FAKE_ITALIC);
}
if attrs != attrs_list.defaults() {
attrs_list.add_span(start..end, attrs);
attrs_list.add_span(start..end, &attrs);
}
last_point = Some(indexed.point);
@ -903,7 +909,7 @@ impl Terminal {
buffer.lines.push(BufferLine::new(
"",
LineEnding::default(),
AttrsList::new(self.default_attrs),
AttrsList::new(&self.default_attrs),
Shaping::Advanced,
));
buffer.set_redraw(true);