Fix text frame drawing.

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

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 9600c0e9d37e5ebade81d2314e21d2f7c842900d..3cd5c58c716a5d5fcae8fcb243eaae7a7bcc059b 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -94,7 +94,6 @@ InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs)
                status_(rhs.status_),
                openinlined_(rhs.openinlined_),
                autoOpen_(rhs.autoOpen_),
-               textdim_(rhs.textdim_),
                // the sole purpose of this copy constructor
                mouse_hover_(false)
 {
@@ -208,18 +207,17 @@ bool InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
                dim = dimensionCollapsed();
                if (geometry() == TopButton
                 || geometry() == LeftButton) {
-                       InsetText::metrics(mi, textdim_);
-                       // This expression should not contain mi.base.texwidth
-                       openinlined_ = !hasFixedWidth()
-                               && textdim_.wid < 0.5 * mi.base.bv->workWidth();
+                       Dimension textdim;
+                       InsetText::metrics(mi, textdim);
+                       openinlined_ = (textdim.wid + dim.wid) < mi.base.textwidth;
                        if (openinlined_) {
                                // Correct for button width.
-                               dim.wid += textdim_.wid;
-                               dim.des = max(dim.des - textdim_.asc + dim.asc, textdim_.des);
-                               dim.asc = textdim_.asc;
+                               dim.wid += textdim.wid;
+                               dim.des = max(dim.des - textdim.asc + dim.asc, textdim.des);
+                               dim.asc = textdim.asc;
                        } else {
-                               dim.des += textdim_.height() + TEXT_TO_BOTTOM_OFFSET;
-                               dim.wid = max(dim.wid, textdim_.wid);
+                               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);
                        }
@@ -246,8 +244,9 @@ bool InsetCollapsable::setMouseHover(bool mouse_hover)
 void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 {
        autoOpen_ = pi.base.bv->cursor().isInside(this);
-       text_.background_color_ = backgroundColor();
-       const int xx = x + TEXT_TO_INSET_OFFSET;
+       int const old_color = pi.background_color;
+       pi.background_color = backgroundColor();
+       int const xx = x + TEXT_TO_INSET_OFFSET;
 
        // Draw button first -- top, left or only
        Dimension dimc = dimensionCollapsed();
@@ -272,55 +271,59 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
        switch (geometry()) {
        case LeftButton:
                textx = xx + dimc.width();
-               texty = top + textdim_.asc;
+               texty = top;
                InsetText::draw(pi, textx, texty);
                break;
        case TopButton:
                textx = xx;
-               texty = top + dimc.height() + textdim_.asc;
+               texty = top + dimc.height();
                InsetText::draw(pi, textx, texty);
                break;
        case ButtonOnly:
                break;
        case NoButton:
                textx = xx;
-               texty = y + textdim_.asc;
+               texty = y;
                InsetText::draw(pi, textx, texty);
                break;
        case SubLabel:
        case Corners:
                textx = xx;
-               texty = y + textdim_.asc;
+               texty = y;
                const_cast<InsetCollapsable *>(this)->setDrawFrame(false);
                InsetText::draw(pi, textx, texty);
                const_cast<InsetCollapsable *>(this)->setDrawFrame(true);
 
                int desc = InsetText::descent();
-               if (status() == Open)
+               if (geometry() == SubLabel)
                        desc -= ascent();
                else
                        desc -= 3;
 
-               pi.pain.line(x, y + desc - 4, x, y + desc, 
+               const int xx1 = xx + border_ - 1;
+               const int xx2 = x + dim_.wid - border_ 
+                       - TEXT_TO_INSET_OFFSET + 1;
+               pi.pain.line(xx1, y + desc - 4, 
+                            xx1, y + desc, 
                        layout_.labelfont.color());
                if (internalStatus() == Open)
-                       pi.pain.line(x, y + desc, 
-                               x + dim_.wid - 3, y + desc,
+                       pi.pain.line(xx1, y + desc, 
+                               xx2, y + desc,
                                layout_.labelfont.color());
                else {
                        // Make status_ value visible:
-                       pi.pain.line(x, y + desc,
-                               x + 4, y + desc,
+                       pi.pain.line(xx1, y + desc,
+                               xx1 + 4, y + desc,
                                layout_.labelfont.color());
-                       pi.pain.line(x + dim_.wid - 7, y + desc,
-                               x + dim_.wid -3, y + desc,
+                       pi.pain.line(xx2 - 4, y + desc,
+                               xx2, y + desc,
                                layout_.labelfont.color());
                }
                pi.pain.line(x + dim_.wid - 3, y + desc, x + dim_.wid - 3, y + desc - 4,
                        layout_.labelfont.color());
 
-               // the label of the charstyle. Can be toggled.
-               if (status() == Open) {
+               // the label below the text. Can be toggled.
+               if (geometry() == SubLabel) {
                        Font font(layout_.labelfont);
                        font.realize(Font(Font::ALL_SANE));
                        font.decSize();
@@ -340,16 +343,17 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
                if (cur.isInside(this)) {
                        y -= ascent();
                        y += 3;
-                       pi.pain.line(x, y + 4, x, y, layout_.labelfont.color());
-                       pi.pain.line(x + 4, y, x, y, layout_.labelfont.color());
-                       pi.pain.line(x + dim_.wid - 3, y + 4, x + dim_.wid - 3, y,
+                       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,
                                layout_.labelfont.color());
-                       pi.pain.line(x + dim_.wid - 7, y, x + dim_.wid - 3, y,
+                       pi.pain.line(xx2 - 4, y, xx2, y,
                                layout_.labelfont.color());
                }
                break;
        }
        setPosCache(pi, x, y);
+       pi.background_color = old_color;
 }
 
 
@@ -362,7 +366,7 @@ void InsetCollapsable::drawSelection(PainterInfo & pi, int x, int y) const
                InsetText::drawSelection(pi, x, y);
                break;
        case TopButton:
-               y += dimensionCollapsed().des + textdim_.asc;
+               y += dimensionCollapsed().des;
                InsetText::drawSelection(pi, x, y);
                break;
        case ButtonOnly:
@@ -387,10 +391,12 @@ void InsetCollapsable::cursorPos(BufferView const & bv,
        case LeftButton:
                x += dimensionCollapsed().wid;
                break;
-       case TopButton:
+       case TopButton: {
+               TextMetrics const & tm = bv.textMetrics(&text_);
                y += dimensionCollapsed().height() - ascent()
-                       + TEXT_TO_INSET_OFFSET + textdim_.asc;
+                       + TEXT_TO_INSET_OFFSET + tm.ascent();
                break;
+       }
        case NoButton:
        case SubLabel:
        case Corners: