Garmelon/toss
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Write transparent Style to Buffer correctly

Browse source
This commit is contained in:
Joscha 2023-02-16 21:27:09 +01:00
parent 9ff8007cae
commit c689d97974
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/buffer.rs
View file

@ -278,16 +278,15 @@ impl Buffer {
return; // Not visible return; // Not visible
} }
// TODO Merge styles
if start_x >= min_x && end_x <= max_x { if start_x >= min_x && end_x <= max_x {
// Fully visible, write actual grapheme // Fully visible, write actual grapheme
let base_style = self.at(start_x as u16, y).style;
for offset in 0..width { for offset in 0..width {
let x = start_x as u16 + offset as u16; let x = start_x as u16 + offset as u16;
self.erase(x, y); self.erase(x, y);
*self.at_mut(x, y) = Cell { *self.at_mut(x, y) = Cell {
content: grapheme.to_string().into_boxed_str(), content: grapheme.to_string().into_boxed_str(),
style: style.content_style, style: style.cover(base_style),
width, width,
offset, offset,
}; };
@ -297,9 +296,10 @@ impl Buffer {
let start_x = start_x.max(0) as u16; let start_x = start_x.max(0) as u16;
let end_x = end_x.min(max_x) as u16; let end_x = end_x.min(max_x) as u16;
for x in start_x..=end_x { for x in start_x..=end_x {
let base_style = self.at(x, y).style;
self.erase(x, y); self.erase(x, y);
*self.at_mut(x, y) = Cell { *self.at_mut(x, y) = Cell {
style: style.content_style, style: style.cover(base_style),
..Default::default() ..Default::default()
}; };
} }