xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow parsing empty strings as default color in face descs

Browse Source
This commit is contained in:
Maxime Coste 2015-10-05 20:32:51 +01:00
parent 27bee18d37
commit 31cc61b6fc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/face_registry.cc
View File

@ -14,9 +14,10 @@ static Face parse_face(StringView facedesc)
if (bg_it != facedesc.end() and attr_it < bg_it) if (bg_it != facedesc.end() and attr_it < bg_it)
throw runtime_error("invalid face description, expected <fg>[,<bg>][+<attr>]"); throw runtime_error("invalid face description, expected <fg>[,<bg>][+<attr>]");
Face res; Face res;
res.fg = str_to_color({facedesc.begin(), std::min(attr_it, bg_it)}); res.fg = attr_it != facedesc.begin() ?
str_to_color({facedesc.begin(), std::min(attr_it, bg_it)}) : Color::Default;
if (bg_it != facedesc.end()) if (bg_it != facedesc.end())
res.bg = str_to_color({bg_it+1, attr_it}); res.bg = bg_it+1 != attr_it ? str_to_color({bg_it+1, attr_it}) : Color::Default;
if (attr_it != facedesc.end()) if (attr_it != facedesc.end())
{ {
for (++attr_it; attr_it != facedesc.end(); ++attr_it) for (++attr_it; attr_it != facedesc.end(); ++attr_it)