more cleanup:

[lyx.git] / src / insets / insetcaption.C

diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index 87f327c80496f8eb183d57c9024d465b5129c8cc..ff747d69540b6a7c9e9e4bee3d0c63b59b873c00 100644 (file)
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -114,19 +114,17 @@ void InsetCaption::setLabel(LCursor & cur) const
                        num = convert<docstring>(counter_);
 
                // Generate the label
-               label = to_utf8(
-                       bformat(from_ascii("%1$s %2$s:"), _(s), 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);
@@ -137,7 +135,9 @@ void InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
        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;
 }
 
 
@@ -153,11 +153,7 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
        // 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);
 }