Circumvent odd stmary font metrics (part of #9990).

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

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 623cebbc77f15b907b57beb3a126a3eba7a2d92e..aeac8b358681eebc60f7e8a6043d613c903ae707 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -213,6 +213,11 @@ void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
        case TopButton:
        case LeftButton:
        case ButtonOnly:
+               if (hasFixedWidth()){
+                       int const mindim = button_dim.x2 - button_dim.x1;
+                       if (mi.base.textwidth < mindim)
+                               mi.base.textwidth = mindim;
+               }
                dim = dimensionCollapsed(bv);
                if (geometry(bv) == TopButton 
                          || geometry(bv) == LeftButton) {
@@ -343,7 +348,6 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
                        int const ww = max(textdim.wid, w);
                        pi.pain.rectText(x + (ww - w) / 2, y + desc + a,
                                buttonLabel(bv), font, Color_none, Color_none);
-                       desc += d;
                }
 
                // a visual cue when the cursor is inside the inset