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

When box background is "none", frame color != black and page color has been set

Browse Source 
then use the page color as box background, not white
This commit is contained in:
Juergen Spitzmueller 2023-10-01 11:08:11 +02:00
parent 343a9749ab
commit 6df25c3585
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/insets/InsetBox.cpp
View File

@ -433,7 +433,7 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
if (useFColorBox()) {
os << maybeBeginL
<< "\\fcolorbox{" << getFrameColor()
<< "}{" << getBackgroundColor()
<< "}{" << getBackgroundColor(buffer().params().isbackgroundcolor)
<< "}{" << "\\makebox";
needEndL = !maybeBeginL.empty();
} else
@ -454,7 +454,7 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const
if (useFColorBox()) {
os << maybeBeginL
<< "\\fcolorbox{" << getFrameColor()
<< "}{" << getBackgroundColor() << "}";
<< "}{" << getBackgroundColor(buffer().params().isbackgroundcolor) << "}";
needEndL = !maybeBeginL.empty();
} else {
if (!cprotect.empty() && contains(runparams.active_chars, '^')) {
@ -887,10 +887,10 @@ string const InsetBox::getFrameColor(bool const gui) const
}
string const InsetBox::getBackgroundColor() const
string const InsetBox::getBackgroundColor(bool const custompb) const
{
if (params_.backgroundcolor == "none")
return "white";
return custompb ? "page_backgroundcolor" : "white";
return params_.backgroundcolor;
}

2
src/insets/InsetBox.h
View File

@ -166,7 +166,7 @@ private:
///
std::string const getFrameColor(bool const gui = false) const;
///
std::string const getBackgroundColor() const;
std::string const getBackgroundColor(bool const custompb = false) const;
///
bool useFColorBox() const;