mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-06 11:23:45 +00:00
Adhere to semantic background color with default branches
This fixes color mismatched when "use system colors" is checked See https://marc.info/?l=lyx-users&m=172797086718347
This commit is contained in:
parent
2facf6eecc
commit
1f7e8d3ffe
@ -114,12 +114,14 @@ void Branch::setColors(string const & lmcol, string const & dmcol)
|
||||
string lmcolor = lmcolor_;
|
||||
string dmcolor = dmcolor_;
|
||||
if (lmcolor == "none")
|
||||
lmcolor = lcolor.getX11HexName(Color_background);
|
||||
else if (lmcolor.size() != 7 || lmcolor[0] != '#')
|
||||
lmcolor = "background";
|
||||
// if we have background color, keep semantic value, as system colors might vary
|
||||
else if (lmcolor != "background" && (lmcolor.size() != 7 || lmcolor[0] != '#'))
|
||||
lmcolor = lcolor.getX11HexName(lcolor.getFromLyXName(lmcolor));
|
||||
if (dmcolor == "none")
|
||||
dmcolor = lcolor.getX11HexName(Color_background, true);
|
||||
else if (dmcolor.size() != 7 || dmcolor[0] != '#')
|
||||
dmcolor = "background";
|
||||
// if we have background color, keep semantic value, as system colors might vary
|
||||
else if (dmcolor != "background" && (dmcolor.size() != 7 || dmcolor[0] != '#'))
|
||||
dmcolor = lcolor.getX11HexName(lcolor.getFromLyXName(dmcolor), true);
|
||||
|
||||
// FIXME UNICODE
|
||||
|
@ -154,6 +154,10 @@ ColorCode InsetBranch::backgroundColor(PainterInfo const & pi) const
|
||||
// FIXME UNICODE
|
||||
string const branchcol = "branch" + branch_id + to_utf8(params_.branch);
|
||||
ColorCode c = lcolor.getFromLyXName(branchcol);
|
||||
// if we have background color, set to semantic value, as system colors
|
||||
// might vary
|
||||
if (lcolor.getX11HexName(c, (theApp() && theApp()->isInDarkMode())) == "background")
|
||||
c = Color_background;
|
||||
if (c == Color_none)
|
||||
c = Color_error;
|
||||
return c;
|
||||
|
Loading…
Reference in New Issue
Block a user