From: Juergen Spitzmueller Date: Sun, 1 Oct 2023 09:38:10 +0000 (+0200) Subject: Simplify X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=242381464b44c5ceb790654e4e47507b7c9b465c;p=features.git Simplify --- diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp index b1444ecd79..1643a0df52 100644 --- a/src/insets/InsetBox.cpp +++ b/src/insets/InsetBox.cpp @@ -433,7 +433,7 @@ void InsetBox::latex(otexstream & os, OutputParams const & runparams) const if (useFColorBox()) { os << maybeBeginL << "\\fcolorbox{" << getFrameColor() - << "}{" << getBackgroundColor(buffer().params().isbackgroundcolor) + << "}{" << getBackgroundColor() << "}{" << "\\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(buffer().params().isbackgroundcolor) << "}"; + << "}{" << getBackgroundColor() << "}"; needEndL = !maybeBeginL.empty(); } else { if (!cprotect.empty() && contains(runparams.active_chars, '^')) { @@ -887,10 +887,12 @@ string const InsetBox::getFrameColor(bool const gui) const } -string const InsetBox::getBackgroundColor(bool const custompb) const +string const InsetBox::getBackgroundColor() const { if (params_.backgroundcolor == "none") - return custompb ? "page_backgroundcolor" : "white"; + return buffer().params().isbackgroundcolor + ? "page_backgroundcolor" + : "white"; return params_.backgroundcolor; } diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h index 29c713716c..f4a743667b 100644 --- a/src/insets/InsetBox.h +++ b/src/insets/InsetBox.h @@ -166,7 +166,7 @@ private: /// std::string const getFrameColor(bool const gui = false) const; /// - std::string const getBackgroundColor(bool const custompb = false) const; + std::string const getBackgroundColor() const; /// bool useFColorBox() const;