anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve the wrapParas routine. Previously, we had "..." as the last

Browse Source 
line, if we were too big. Now, we put "..." at the end of the last line.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36988 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-12-22 01:28:32 +00:00
parent 4e8cc18554
commit 4aead1ffde
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/support/lstrings.cpp
View File

@ -1153,6 +1153,7 @@ docstring wrap(docstring const & str, int const ind, size_t const width)
docstring wrapParas(docstring const & str, int const indent, docstring wrapParas(docstring const & str, int const indent,
size_t const width, size_t const maxlines) size_t const width, size_t const maxlines)
{ {
docstring const dots = from_ascii("...");
if (str.empty()) if (str.empty())
return docstring(); return docstring();
@ -1167,9 +1168,21 @@ docstring wrapParas(docstring const & str, int const indent,
if (nlines == 0) if (nlines == 0)
continue; continue;
size_t const curlines = retval.size(); size_t const curlines = retval.size();
if (maxlines > 0 && curlines + nlines >= maxlines) { if (maxlines > 0 && curlines + nlines > maxlines) {
tmp.resize(maxlines - curlines - 1); tmp.resize(maxlines - curlines);
tmp.push_back(from_ascii("...")); docstring last = tmp.back();
size_t const lsize = last.size();
if (lsize > width - 3) {
size_t const i = last.find_last_of(' ', width - 3);
if (i == docstring::npos || i <= size_t(indent))
// no space found
last = last.substr(0, lsize - 3) + dots;
else
last = last.substr(0, i) + dots;
} else
last += dots;
tmp.pop_back();
tmp.push_back(last);
} }
retval.insert(retval.end(), tmp.begin(), tmp.end()); retval.insert(retval.end(), tmp.begin(), tmp.end());
if (maxlines > 0 && retval.size() >= maxlines) if (maxlines > 0 && retval.size() >= maxlines)