Inset::addToToc(): change signature. Use DocIterator instead of ParConstIterator...

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

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 7b8e292bd07ccdd379dc295f4e4b50a59fa71d7a..c255d24709b367f42d91db9bcd62cfe43fc6e094 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -34,7 +34,7 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
-#include "support/assert.h"
+#include "support/lassert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
@@ -112,13 +112,26 @@ docstring InsetCollapsable::toolTip(BufferView const & bv, int x, int y) const
        if (x > xo(bv) + dim.wid || y > yo(bv) + dim.des)
                return docstring();
 
+       docstring default_tip;
        switch (status_) {
        case Open:
-               return _("Left-click to collapse the inset");
+               default_tip = _("Left-click to collapse the inset");
+               break;
        case Collapsed:
-               return _("Left-click to open the inset");
+               default_tip = _("Left-click to open the inset");
+               break;
        }
-       return docstring();
+
+       OutputParams rp(&buffer().params().encoding());
+       odocstringstream ods;
+       InsetText::plaintext(ods, rp);
+       docstring content_tip = ods.str();
+       // shorten it if necessary
+       if (content_tip.size() > 200)
+               content_tip = content_tip.substr(0, 200) + "...";
+       if (!isOpen() && !content_tip.empty())
+               return content_tip + '\n' + default_tip;
+       return default_tip;
 }
 
 
@@ -628,7 +641,6 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_ACCENT_HUNGARIAN_UMLAUT:
        case LFUN_ACCENT_MACRON:
        case LFUN_ACCENT_OGONEK:
-       case LFUN_ACCENT_SPECIAL_CARON:
        case LFUN_ACCENT_TIE:
        case LFUN_ACCENT_TILDE:
        case LFUN_ACCENT_UMLAUT:
@@ -743,8 +755,10 @@ void InsetCollapsable::setStatus(Cursor & cur, CollapseStatus status)
 {
        status_ = status;
        setButtonLabel();
-       if (status_ == Collapsed)
+       if (status_ == Collapsed) {
                cur.leaveInset(*this);
+               mouse_hover_ = false;
+       }
 }