anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug 12459

Browse Source 
When checking for branch color, take into account that some branches
are defined in the master document only, some only in the child.
This commit is contained in:
Juergen Spitzmueller 2022-01-22 09:30:25 +01:00
parent 2764ed20c2
commit 942538c02d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/insets/InsetBranch.cpp
View File

@ -136,9 +136,11 @@ ColorCode InsetBranch::backgroundColor(PainterInfo const & pi) const
{
if (params_.branch.empty())
return Inset::backgroundColor(pi);
string const branch_id = (buffer().masterParams().branchlist().find(params_.branch))
? convert<string>(buffer().masterParams().branchlist().id())
: convert<string>(buffer().params().branchlist().id());
// FIXME UNICODE
string const branchcol = "branch" + convert<string>(buffer().params().branchlist().id())
+ to_utf8(params_.branch);
string const branchcol = "branch" + branch_id + to_utf8(params_.branch);
ColorCode c = lcolor.getFromLyXName(branchcol);
if (c == Color_none)
c = Color_error;