* src/paragraph_funcs.cpp (breakParagraph): change parameter 'flag' to

[lyx.git] / src / insets / InsetCaption.cpp

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index fc632a10d21b34458f22741c789441198503f681..5c14efac0a84586daaa750a66951e9448979a14e 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -40,7 +40,6 @@
 #include <sstream>
 
 
-using std::auto_ptr;
 using std::endl;
 using std::string;
 using std::ostream;
@@ -48,7 +47,6 @@ using std::ostream;
 
 namespace lyx {
 
-using support::bformat;
 
 InsetCaption::InsetCaption(InsetCaption const & ic)
        : InsetText(ic), textclass_(ic.textclass_)
@@ -127,30 +125,23 @@ void InsetCaption::addToToc(TocList & toclist, Buffer const & buf, ParConstItera
 }
 
 
-bool InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       int const width_offset = TEXT_TO_INSET_OFFSET / 2;
-       mi.base.textwidth -= width_offset;
-
+       Font tmpfont = mi.base.font;
+       mi.base.font = mi.base.bv->buffer().params().getFont();
        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;
        dim.wid = labelwidth_;
        Dimension textdim;
-       InsetText::metrics(mi, textdim);
-       // Correct for button width, and re-fit
+       // 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 = std::max(dim.des - textdim.asc + dim.asc, textdim.des);
        dim.asc = textdim.asc;
        dim.wid += textdim.wid;
-       dim.asc += TEXT_TO_INSET_OFFSET;
-       dim.des += TEXT_TO_INSET_OFFSET;
-       dim.wid += width_offset;
-       mi.base.textwidth += width_offset;
-       bool const changed = dim_ != dim;
-       dim_ = dim;
-       return changed;
 }
 
 
@@ -164,17 +155,11 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
 
        // Answer: the text inset (in buffer_funcs.cpp: setCaption).
 
-       labelwidth_ = pi.pain.text(x, y, full_label_, pi.base.font);
-       // add some space to separate the label from the inset text
-       labelwidth_ += 2 * TEXT_TO_INSET_OFFSET;
+       Font tmpfont = pi.base.font;
+       pi.base.font = pi.base.bv->buffer().params().getFont();
+       pi.pain.text(x, y, full_label_, pi.base.font);
        InsetText::draw(pi, x + labelwidth_, y);
-       setPosCache(pi, x, y);
-}
-
-
-void InsetCaption::drawSelection(PainterInfo & pi, int x, int y) const
-{
-       InsetText::drawSelection(pi, x + labelwidth_, y);
+       pi.base.font = tmpfont;
 }
 
 
@@ -213,7 +198,6 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd,
        switch (cmd.action) {
 
        case LFUN_BREAK_PARAGRAPH:
-       case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
        case LFUN_BREAK_PARAGRAPH_SKIP:
                status.enabled(false);
                return true;
@@ -288,6 +272,7 @@ int InsetCaption::getOptArg(Buffer const & buf, odocstream & os,
 
 void InsetCaption::updateLabels(Buffer const & buf, ParIterator const & it)
 {
+       using support::bformat;
        TextClass const & tclass = buf.params().getTextClass();
        Counters & cnts = tclass.counters();
        string const & type = cnts.current_float();
@@ -315,9 +300,9 @@ void InsetCaption::updateLabels(Buffer const & buf, ParIterator const & it)
 }
 
 
-auto_ptr<Inset> InsetCaption::doClone() const
+Inset * InsetCaption::clone() const
 {
-       return auto_ptr<Inset>(new InsetCaption(*this));
+       return new InsetCaption(*this);
 }