Cyclic0007/ratatui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(crossterm): terminal should keep Bold when removing Dim (#1541)

Browse Source 
The Dim removal should behave the same as the logic for Bold removal
that sends NormalIntensity sequence and then restores Dim when needed.

Signed-off-by: Martin Sivak <mars@montik.net>
This commit is contained in:
Martin Sivák
2024-12-03 22:21:59 +01:00
committed by GitHub
parent 17bba14540
commit 18e70d3d51
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ratatui-crossterm/src/lib.rs
View File

@@ -405,11 +405,19 @@ impl ModifierDiff {
if removed.contains(Modifier::REVERSED) {
queue!(w, SetAttribute(CrosstermAttribute::NoReverse))?;
}
if removed.contains(Modifier::BOLD) {
if removed.contains(Modifier::BOLD) || removed.contains(Modifier::DIM) {
// Bold and Dim are both reset by applying the Normal intensity
queue!(w, SetAttribute(CrosstermAttribute::NormalIntensity))?;
// The remaining Bold and Dim attributes must be
// reapplied after the intensity reset above.
if self.to.contains(Modifier::DIM) {
queue!(w, SetAttribute(CrosstermAttribute::Dim))?;
}
if self.to.contains(Modifier::BOLD) {
queue!(w, SetAttribute(CrosstermAttribute::Bold))?;
}
}
if removed.contains(Modifier::ITALIC) {
queue!(w, SetAttribute(CrosstermAttribute::NoItalic))?;
@@ -417,9 +425,6 @@ impl ModifierDiff {
if removed.contains(Modifier::UNDERLINED) {
queue!(w, SetAttribute(CrosstermAttribute::NoUnderline))?;
}
if removed.contains(Modifier::DIM) {
queue!(w, SetAttribute(CrosstermAttribute::NormalIntensity))?;
}
if removed.contains(Modifier::CROSSED_OUT) {
queue!(w, SetAttribute(CrosstermAttribute::NotCrossedOut))?;
}