if (cur.top().text() == &text_) {
string s;
size_t i = cur.depth();
- while (i > 0) {
- --i;
- InsetBase * const in = &cur[i].inset();
- if (in->lyxCode() == InsetBase::FLOAT_CODE
- || in->lyxCode() == InsetBase::WRAP_CODE) {
- s = in->getInsetName();
- break;
- }
+ while (i > 0) {
+ --i;
+ InsetBase * const in = &cur[i].inset();
+ if (in->lyxCode() == InsetBase::FLOAT_CODE ||
+ in->lyxCode() == InsetBase::WRAP_CODE) {
+ s = to_utf8(in->getInsetName());
+ break;
}
+ }
Floating const & fl = textclass_.floats().getType(s);
s = fl.name();
- string num;
+ docstring num;
if (s.empty())
s = "Senseless";
else
- num = convert<string>(counter_);
+ num = convert<docstring>(counter_);
// Generate the label
- label = to_utf8(
- bformat(from_ascii("%1$s %2$s:"), _(s), from_ascii(num)));
+ label = bformat(from_ascii("%1$s %2$s:"), _(s), num);
}
}
-void InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
+bool InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
{
mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
LCursor cur = mi.base.bv->cursor();
setLabel(cur);
- docstring dlab(label.begin(), label.end());
- labelwidth_ = theFontMetrics(mi.base.font).width(dlab);
+ labelwidth_ = theFontMetrics(mi.base.font).width(label);
dim.wid = labelwidth_;
Dimension textdim;
InsetText::metrics(mi, textdim);
dim.des += TEXT_TO_INSET_OFFSET;
dim.wid += 2 * TEXT_TO_INSET_OFFSET;
mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
+ bool const changed = dim_ != dim;
dim_ = dim;
+ return changed;
}
// belongs to.
LCursor cur = pi.base.bv->cursor();
setLabel(cur);
- docstring dlab(label.begin(), label.end());
- // FXIME: instead of using the fontLoader metrics, we should make
- // painter::text() returns the drawn text witdh.
- labelwidth_ = theFontMetrics(pi.base.font).width(dlab);
- pi.pain.text(x, y, dlab, pi.base.font);
+ labelwidth_ = pi.pain.text(x, y, label, pi.base.font);
InsetText::draw(pi, x + labelwidth_, y);
setPosCache(pi, x, y);
}