Don't save background color in Text. Hand it down at drawing time.

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

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 4ae1d7a1585eba0547154d758d7d0765132e2e7a..fc842f7d6e6af7afbcf64e180205606d5c7893c5 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -59,10 +59,10 @@ InsetCollapsable::Geometry InsetCollapsable::geometry() const
                        return ButtonOnly;
 
        case Minimalistic:
-               return NoButton;
+               return status() == Open ? NoButton : ButtonOnly ;
 
        case Conglomerate:
-               return status() == Open ? SubLabel : Corners;
+               return status() == Open ? SubLabel : Corners ;
        }
 
        // dummy return value to shut down a warning,
@@ -175,7 +175,7 @@ bool InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
        using std::max;
 
        autoOpen_ = mi.base.bv->cursor().isInside(this);
-       mi.base.textwidth -= (int) (1.5 * TEXT_TO_INSET_OFFSET);
+       mi.base.textwidth -= int(1.5 * TEXT_TO_INSET_OFFSET);
 
        switch (geometry()) {
        case NoButton:
@@ -209,17 +209,9 @@ bool InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
                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();
+                       openinlined_ = (textdim_.wid + dim.wid) < mi.base.textwidth;
                        if (openinlined_) {
-                               // FIXME: this is not ideal but we need to clear it
-                               // out because the Row::changed() status is reset.
-                               mi.base.bv->textMetrics(&text_).clear();
-                               // Correct for button width, and re-fit
-                               mi.base.textwidth -= dim.wid;
-                               InsetText::metrics(mi, textdim_);
-                               mi.base.textwidth += dim.wid;
+                               // Correct for button width.
                                dim.wid += textdim_.wid;
                                dim.des = max(dim.des - textdim_.asc + dim.asc, textdim_.des);
                                dim.asc = textdim_.asc;
@@ -234,8 +226,8 @@ bool InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
        }
        dim.asc += TEXT_TO_INSET_OFFSET;
        dim.des += TEXT_TO_INSET_OFFSET;
-       dim.wid += (int) (1.5 * TEXT_TO_INSET_OFFSET);
-       mi.base.textwidth += (int) (1.5 * TEXT_TO_INSET_OFFSET);
+       dim.wid += int(1.5 * TEXT_TO_INSET_OFFSET);
+       mi.base.textwidth += int(1.5 * TEXT_TO_INSET_OFFSET);
        bool const changed = dim_ != dim;
        dim_ = dim;
        return changed;
@@ -252,7 +244,7 @@ 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();
+       pi.background_color = backgroundColor();
        const int xx = x + TEXT_TO_INSET_OFFSET;
 
        // Draw button first -- top, left or only
@@ -267,6 +259,11 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
                button_dim.y2 = top + dimc.height();
 
                pi.pain.buttonText(xx, top + dimc.asc, layout_.labelstring, layout_.labelfont, mouse_hover_);
+       } else {
+               button_dim.x1 = 0;
+               button_dim.y1 = 0;
+               button_dim.x2 = 0;
+               button_dim.y2 = 0;
        }
 
        int textx, texty;
@@ -297,31 +294,35 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
                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();
@@ -336,16 +337,16 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
                                s, font, Color::none, Color::none);
                }
 
-               // a visual cue when the cursor is inside the inset
+               // a visual clue when the cursor is inside the inset
                Cursor & cur = pi.base.bv->cursor();
                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;