Take label width into account for SubLabel insets

The drawing of the label should not go further than inset width.

Fixes bug #12046.

(cherry picked from commit 3950f054977c60cdbf73c805cbd898003974aaee)

diff --git a/src/insets/InsetCollapsible.cpp b/src/insets/InsetCollapsible.cpp
index 3a2a9a56465084731ed72e72d6f6af47161ac8c7..81b456112a16e03598cbc873b230ef38c40faeeb 100644 (file)
--- a/src/insets/InsetCollapsible.cpp
+++ b/src/insets/InsetCollapsible.cpp
@@ -184,6 +184,7 @@ void InsetCollapsible::metrics(MetricsInfo & mi, Dimension & dim) const
                int d = 0;
                theFontMetrics(font).rectText(buttonLabel(bv), w, a, d);
                dim.des += a + d;
+               dim.wid = max(dim.wid, w);
                break;
                }
        case TopButton:

diff --git a/status.23x b/status.23x
index d9c81fb531999bf118caba104c1f5820fd24a611..4f282fa68bf2226d20f149b4403bf6fe09d67c43 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -62,6 +62,8 @@ What's new
 
 - Do not close spellchecker after "Replace All" action (bug 11310).
 
+- Fix width of collapsible insets with sublabels (bug 12046).
+
 
 * INTERNALS