starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-02-06 05:34:59 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

Improve TSF color filtering logic (re: QQPinyin) (#19117)

Browse Source 
If an IME provider sets both `crText` and `crBk` we should respect this,
but the previous logic would incorrectly assert for `crLine !=
TF_CT_NONE`.

## Validation Steps Performed
❌ I'm not aware which TSF even sets these colors in a
way that's compatible with us in the first place...
This commit is contained in:
Leonard Hecker
2025-07-15 00:19:10 +02:00
committed by GitHub
parent 0cbb6b1f2f
commit f2b30b4e1e
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/tsf/Implementation.cpp
View File

@@ -719,17 +719,12 @@ TextAttribute Implementation::_textAttributeFromAtom(TfGuidAtom atom) const
// the others is likely not properly tested anyway, so we reject those cases.
// After all, what behavior do we expect, if the IME sends e.g. foreground=blue,
// without knowing whether our terminal theme already uses a blue background?
if (da.crText.type == da.crBk.type && da.crText.type == da.crLine.type)
if (da.crText.type != TF_CT_NONE && da.crText.type == da.crBk.type)
{
if (da.crText.type != TF_CT_NONE)
{
attr.SetForeground(_colorFromDisplayAttribute(da.crText));
}
if (da.crBk.type != TF_CT_NONE)
{
attr.SetBackground(_colorFromDisplayAttribute(da.crBk));
}
if (da.crLine.type != TF_CT_NONE)
attr.SetForeground(_colorFromDisplayAttribute(da.crText));
attr.SetBackground(_colorFromDisplayAttribute(da.crBk));
// I'm not sure what the best way to handle this is.
if (da.crText.type == da.crLine.type)
{
attr.SetUnderlineColor(_colorFromDisplayAttribute(da.crLine));
}