Cocoa based Qt-4.6 needs to paint every character separately to match metrics computa...

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

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index c75285796c1dcaee350b9e1b0833a28339bb5180..a8a114f3a6481bab3fed4477fbd643c2c697682d 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -583,9 +583,9 @@ void InsetCollapsable::setLabel(docstring const & l)
 
 docstring const InsetCollapsable::buttonLabel(BufferView const & bv) const
 {
-       docstring const label = labelstring_.empty() ? 
-               translateIfPossible(getLayout().labelstring()) : labelstring_;
        InsetLayout const & il = getLayout();
+       docstring const label = labelstring_.empty() ? 
+               translateIfPossible(il.labelstring()) : labelstring_;
        if (!il.contentaslabel() || geometry(bv) != ButtonOnly)
                return label;
        return getNewLabel(label);
@@ -621,17 +621,23 @@ InsetLayout::InsetDecoration InsetCollapsable::decoration() const
 docstring InsetCollapsable::contextMenu(BufferView const & bv, int x,
        int y) const
 {
+       docstring context_menu = contextMenuName();
+       docstring const it_context_menu = InsetText::contextMenuName();
        if (decoration() == InsetLayout::CONGLOMERATE)
-               return contextMenuName() + ";" + InsetText::contextMenuName();
+               return context_menu + ";" + it_context_menu;
+
+       docstring const ic_context_menu = InsetCollapsable::contextMenuName();
+       if (ic_context_menu != context_menu)
+               context_menu += ";" + ic_context_menu;
 
        if (geometry(bv) == NoButton)
-               return contextMenuName() + ";" + InsetText::contextMenuName();
+               return context_menu + ";" + it_context_menu;
 
        Dimension dim = dimensionCollapsed(bv);
        if (x < xo(bv) + dim.wid && y < yo(bv) + dim.des)
-               return contextMenuName();
+               return context_menu;
 
-       return InsetText::contextMenuName();
+       return it_context_menu;
 }