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

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

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 0c260c00426cf79a2228eb05fd2c75f13a070a3d..654979df7f16116b1bdf393098ffd9eb095baf23 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -170,7 +170,7 @@ Dimension InsetCollapsable::dimensionCollapsed() const
 }
 
 
-bool InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        autoOpen_ = mi.base.bv->cursor().isInside(this);
 
@@ -181,7 +181,7 @@ bool InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
        case Corners:
                InsetText::metrics(mi, dim);
                dim.des -= 3;
-               dim.asc -= 3;
+               dim.asc -= 1;
                break;
        case SubLabel: {
                InsetText::metrics(mi, dim);
@@ -195,8 +195,7 @@ bool InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
                int d = 0;
                docstring s = layout_.labelstring;
                theFontMetrics(font).rectText(s, w, a, d);
-               dim.wid = max(dim.wid, w);
-               dim.des += ascent();
+               dim.des += a + d;
                break;
                }
        case TopButton:
@@ -216,16 +215,10 @@ bool InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
                        } else {
                                dim.des += textdim.height() + TEXT_TO_BOTTOM_OFFSET;
                                dim.wid = max(dim.wid, textdim.wid);
-                               if (hasFixedWidth())
-                                       dim.wid = max(dim.wid, mi.base.textwidth);
                        }
                }
                break;
        }
-
-       bool const changed = dim_ != dim;
-       dim_ = dim;
-       return changed;
 }
 
 
@@ -290,14 +283,12 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
                InsetText::draw(pi, textx, texty);
                const_cast<InsetCollapsable *>(this)->setDrawFrame(true);
 
-               int desc = InsetText::descent();
-               if (geometry() == SubLabel)
-                       desc -= ascent();
-               else
+               int desc = textdim.descent();
+               if (geometry() == Corners)
                        desc -= 3;
 
                const int xx1 = x + TEXT_TO_INSET_OFFSET - 1;
-               const int xx2 = x + dim_.wid - 2 * TEXT_TO_INSET_OFFSET - 1;
+               const int xx2 = x + textdim.wid - TEXT_TO_INSET_OFFSET + 1;
                pi.pain.line(xx1, y + desc - 4, 
                             xx1, y + desc, 
                        layout_.labelfont.color());
@@ -314,7 +305,7 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
                                xx2, y + desc,
                                layout_.labelfont.color());
                }
-               pi.pain.line(x + dim_.wid - 3, y + desc, x + dim_.wid - 3, y + desc - 4,
+               pi.pain.line(x + textdim.wid - 3, y + desc, x + textdim.wid - 3, y + desc - 4,
                        layout_.labelfont.color());
 
                // the label below the text. Can be toggled.
@@ -326,21 +317,22 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
                        int w = 0;
                        int a = 0;
                        int d = 0;
-                       // FIXME UNICODE
                        docstring s = layout_.labelstring;
                        theFontMetrics(font).rectText(s, w, a, d);
-                       pi.pain.rectText(x + (dim_.wid - w) / 2, y + desc + a,
+                       int const ww = max(textdim.wid, w);
+                       pi.pain.rectText(x + (ww - w) / 2, y + desc + a,
                                s, font, Color::none, Color::none);
+                       desc += d;
                }
 
-               // a visual clue when the cursor is inside the inset
+               // a visual cue when the cursor is inside the inset
                Cursor & cur = pi.base.bv->cursor();
                if (cur.isInside(this)) {
-                       y -= ascent();
+                       y -= textdim.asc;
                        y += 3;
                        pi.pain.line(xx1, y + 4, xx1, y, layout_.labelfont.color());
                        pi.pain.line(xx1 + 4, y, xx1, y, layout_.labelfont.color());
-                       pi.pain.line(xx2, y + 4, x + dim_.wid - 3, y,
+                       pi.pain.line(xx2, y + 4, xx2, y,
                                layout_.labelfont.color());
                        pi.pain.line(xx2 - 4, y, xx2, y,
                                layout_.labelfont.color());
@@ -354,6 +346,8 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 void InsetCollapsable::cursorPos(BufferView const & bv,
                CursorSlice const & sl, bool boundary, int & x, int & y) const
 {
+       if (geometry() == ButtonOnly)
+               status_ = Open;
        BOOST_ASSERT(geometry() != ButtonOnly);
 
        InsetText::cursorPos(bv, sl, boundary, x, y);