Tooltips for collapsables and branches

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22956 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index 0eed816e60643efde356f7693ca761b9a018f878..f0efce791a34b5f362904900dbb5836d1843bbbd 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -76,6 +76,12 @@ void InsetBranch::read(Buffer const & buf, Lexer & lex)
 }
 
 
+docstring InsetBranch::toolTip(BufferView const & bv, int x, int y) const
+{
+       return _("Branch: ") + params_.branch;
+}
+
+
 void InsetBranch::setButtonLabel()
 {
        docstring s = _("Branch: ") + params_.branch;

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index 30305d8235740d18e8b2cb28bf64035b98209321..c62fbdd52bbaa3b717ae869a83f9dd5521bae214 100644 (file)
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -84,6 +84,8 @@ public:
        virtual void updateLabels(Buffer const &, ParIterator const &);
        ///
        bool isMacroScope(Buffer const & buf) const;
+       ///
+       docstring toolTip(BufferView const & bv, int x, int y) const;
 protected:
        ///
        InsetBranch(InsetBranch const &);

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index c4d16de4ecfb6d241019dd1e6d52116b20f7dcec..051c4ed769ffe517f8ae44c767a2e68f5846ee48 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -103,7 +103,9 @@ InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs)
 docstring InsetCollapsable::toolTip(BufferView const & bv, int x, int y) const
 {
        Dimension dim = dimensionCollapsed();
-       if (x > xo(bv) + dim.wid || y > yo(bv) + dim.des)
+       if (geometry() == NoButton)
+               return layout_->labelstring;
+       else if (x > xo(bv) + dim.wid || y > yo(bv) + dim.des)
                return docstring();
 
        switch (status_) {