anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #7774. It should be fine to show the complete index entry

Browse Source 
in the TOC, as these generally aren't that long.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40627 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2012-01-16 15:08:55 +00:00
parent b4b4eac710
commit af5938cb6c
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Text.cpp
View File

@ -69,6 +69,7 @@
#include <boost/next_prior.hpp> #include <boost/next_prior.hpp>
#include <limits>
#include <sstream> #include <sstream>
using namespace std; using namespace std;
@ -1942,7 +1943,10 @@ docstring Text::asString(pit_type beg, pit_type end, int options) const
void Text::forToc(docstring & os, size_t maxlen, bool shorten) const void Text::forToc(docstring & os, size_t maxlen, bool shorten) const
{ {
LASSERT(maxlen > 10, maxlen = 30); if (maxlen == 0)
maxlen = std::numeric_limits<std::size_t>::max();
else
LASSERT(maxlen >= 8, maxlen = TOC_ENTRY_LENGTH);
for (size_t i = 0; i != pars_.size() && os.length() < maxlen; ++i) for (size_t i = 0; i != pars_.size() && os.length() < maxlen; ++i)
pars_[i].forToc(os, maxlen); pars_[i].forToc(os, maxlen);
if (shorten && os.length() >= maxlen) if (shorten && os.length() >= maxlen)

2
src/Text.h
View File

@ -129,6 +129,8 @@ public:
/// of \param os. If \param shorten is true, then we will shorten /// of \param os. If \param shorten is true, then we will shorten
/// \param os to maxlen chars and replace the final three by "..., /// \param os to maxlen chars and replace the final three by "...,
/// if \param os is longer than maxlen chars. /// if \param os is longer than maxlen chars.
/// if \param maxlen is passed as 0, then it is ignored. (In fact,
/// it is reset to the maximum value for size_t.)
void forToc(docstring & os, size_t maxlen, bool shorten = true) const; void forToc(docstring & os, size_t maxlen, bool shorten = true) const;
/// insert a character at cursor position /// insert a character at cursor position

2
src/insets/InsetIndex.cpp
View File

@ -356,7 +356,7 @@ void InsetIndex::addToToc(DocIterator const & cpit) const
DocIterator pit = cpit; DocIterator pit = cpit;
pit.push_back(CursorSlice(const_cast<InsetIndex &>(*this))); pit.push_back(CursorSlice(const_cast<InsetIndex &>(*this)));
docstring str; docstring str;
text().forToc(str, TOC_ENTRY_LENGTH); text().forToc(str, 0);
buffer().tocBackend().toc("index").push_back(TocItem(pit, 0, str)); buffer().tocBackend().toc("index").push_back(TocItem(pit, 0, str));
// Proceed with the rest of the inset. // Proceed with the rest of the inset.
InsetCollapsable::addToToc(cpit); InsetCollapsable::addToToc(cpit);

2
status.20x
View File

@ -180,6 +180,8 @@ What's new
- Fix broken instant preview due to ghostscript on 64-bit Windows (bug 7938). - Fix broken instant preview due to ghostscript on 64-bit Windows (bug 7938).
- Show entire index entry in outliner (bug 7774).
* DOCUMENTATION AND LOCALIZATION * DOCUMENTATION AND LOCALIZATION