Fix text frame drawing.

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

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 826b2a3c5a906c855041252560884b06d0017c96..3cd5c58c716a5d5fcae8fcb243eaae7a7bcc059b 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -244,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);
+       int const old_color = pi.background_color;
        pi.background_color = backgroundColor();
-       const int xx = x + TEXT_TO_INSET_OFFSET;
+       int const xx = x + TEXT_TO_INSET_OFFSET;
 
        // Draw button first -- top, left or only
        Dimension dimc = dimensionCollapsed();
@@ -352,6 +353,7 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
                break;
        }
        setPosCache(pi, x, y);
+       pi.background_color = old_color;
 }
 
 
@@ -389,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;
+                       + TEXT_TO_INSET_OFFSET + tm.ascent();
                break;
+       }
        case NoButton:
        case SubLabel:
        case Corners: