anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-14 04:21:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove tweaks of [pm]i.base.font in InsetCaption

Browse Source 
Captions do not reset font settings (try to insert caption in emph context).

Part of investigation of bug #12204.
This commit is contained in:
Jean-Marc Lasgouttes 2021-03-24 16:27:05 +01:00
parent b37929fdb3
commit d03435bc77
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/insets/InsetCaption.cpp
View File

@ -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);