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_ += 2 * TEXT_TO_INSET_OFFSET;
+ labelwidth_ += leftOffset(mi.base.bv) + rightOffset(mi.base.bv);
dim.wid = labelwidth_;
Dimension textdim;
// Correct for button and label width
void InsetCaption::drawBackground(PainterInfo & pi, int x, int y) const
{
TextMetrics & tm = pi.base.bv->textMetrics(&text());
- int const h = tm.height() + 2 * TEXT_TO_INSET_OFFSET;
- int const yy = y - TEXT_TO_INSET_OFFSET - tm.ascent();
+ int const h = tm.height() + topOffset(pi.base.bv) + bottomOffset(pi.base.bv);
+ int const yy = y - topOffset(pi.base.bv) - tm.ascent();
pi.pain.fillRectangle(x, yy, labelwidth_, h, pi.backgroundColor(this));
}
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);
- int const xx = x + TEXT_TO_INSET_OFFSET;
+ int const xx = x + leftOffset(pi.base.bv);
pi.pain.text(xx, y, full_label_, pi.base.font);
InsetText::draw(pi, x + labelwidth_, y);
pi.base.font = tmpfont;
OutputParams runparams = runparams_in;
// Some fragile commands (labels, index entries)
// are output after the caption (#2154)
- runparams.postpone_fragile_stuff = true;
+ runparams.postpone_fragile_stuff = buffer().masterParams().postpone_fragile_content;
InsetText::latex(os, runparams);
if (!runparams.post_macro.empty()) {
// Output the stored fragile commands (labels, indices etc.)