[LyX/master] Remove tweaks of [pm]i.base.font in InsetCaption
Jean-Marc Lasgouttes
lasgouttes at lyx.org
Wed Mar 24 15:39:23 UTC 2021
commit d03435bc777c3e8e811eca2d61fcce999679ee47
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date: Wed Mar 24 16:27:05 2021 +0100
Remove tweaks of [pm]i.base.font in InsetCaption
Captions do not reset font settings (try to insert caption in emph context).
Part of investigation of bug #12204.
---
src/insets/InsetCaption.cpp | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 2e037d6..5373210 100644
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -111,8 +111,6 @@ void InsetCaption::addToToc(DocIterator const & cpit, bool output_active,
void InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
{
- FontInfo tmpfont = mi.base.font;
- mi.base.font = mi.base.bv->buffer().params().getFont().fontInfo();
labelwidth_ = theFontMetrics(mi.base.font).width(full_label_);
// add some space to separate the label from the inset text
labelwidth_ += leftOffset(mi.base.bv) + rightOffset(mi.base.bv);
@@ -121,7 +119,6 @@ void InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
// Correct for button and label width
mi.base.textwidth -= dim.wid;
InsetText::metrics(mi, textdim);
- mi.base.font = tmpfont;
mi.base.textwidth += dim.wid;
dim.des = max(dim.des - textdim.asc + dim.asc, textdim.des);
dim.asc = textdim.asc;
@@ -152,7 +149,6 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
rtl_ = !pi.ltr_pos;
FontInfo tmpfont = pi.base.font;
- pi.base.font = pi.base.bv->buffer().params().getFont().fontInfo();
pi.base.font.setColor(pi.textColor(pi.base.font.color()).baseColor);
if (is_deleted_)
pi.base.font.setStrikeout(FONT_ON);
More information about the lyx-cvs
mailing list