fix two metrics bug + remove an extra metrics call

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19954 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 3f64b4e3091d87ce384714a1690a733d2b12ec03..7b25e463d1723345b9cedcc3e9579c46633944c8 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -128,24 +128,22 @@ void InsetCaption::addToToc(TocList & toclist, Buffer const & buf, ParConstItera
 bool InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        int const width_offset = TEXT_TO_INSET_OFFSET / 2;
-       mi.base.textwidth -= width_offset;
 
        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
+       dim.wid += width_offset;
+       // Correct for button and label width
        mi.base.textwidth -= dim.wid;
        InsetText::metrics(mi, textdim);
+       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;

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index ac1d5875a35bb6416a562cb4da8c16a70b1f76e2..4ae1d7a1585eba0547154d758d7d0765132e2e7a 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -219,6 +219,7 @@ bool InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
                                // Correct for button width, and re-fit
                                mi.base.textwidth -= dim.wid;
                                InsetText::metrics(mi, textdim_);
+                               mi.base.textwidth += dim.wid;
                                dim.wid += textdim_.wid;
                                dim.des = max(dim.des - textdim_.asc + dim.asc, textdim_.des);
                                dim.asc = textdim_.asc;

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 20ee632763b012d90137ab04875b8fb09043fa24..dc7074a41e27580c7069badc9a1b3547dbdeaa96 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -170,15 +170,15 @@ bool InsetText::metrics(MetricsInfo & mi, Dimension & dim) const
        TextMetrics & tm = mi.base.bv->textMetrics(&text_);
 
        //lyxerr << "InsetText::metrics: width: " << mi.base.textwidth << endl;
-       mi.base.textwidth -= 2 * border_;
        font_ = mi.base.font;
        // Hand font through to contained lyxtext:
        text_.font_ = mi.base.font;
+       mi.base.textwidth -= 2 * border_;
        tm.metrics(mi, dim);
+       mi.base.textwidth += 2 * border_;
        dim.asc += border_;
        dim.des += border_;
        dim.wid += 2 * border_;
-       mi.base.textwidth += 2 * border_;
        bool const changed = dim_ != dim;
        dim_ = dim;
        return changed;