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

Revert last three commits.

Browse Source 
There are other issues here. The big one is in TextMetrics::getPitNearY,
where -1 is used as a 'special' return value for pit.
This commit is contained in:
Richard Kimberly Heck 2020-04-26 03:08:35 -04:00
parent c92b4f27ec
commit 7b9dc7bc9e
6 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/BufferView.cpp
View File

@ -2860,7 +2860,7 @@ void BufferView::updateMetrics(Update::flags & update_flags)
int y1 = d->anchor_ypos_ - anchor_pm.ascent();
// We are now just above the anchor paragraph.
pit_type pit1 = d->anchor_pit_ - 1;
while (y1 >= 0) {
for (; pit1 >= 0 && y1 >= 0; --pit1) {
tm.redoParagraph(pit1);
ParagraphMetrics & pm = tm.par_metrics_[pit1];
y1 -= pm.descent();
@ -2868,9 +2868,6 @@ void BufferView::updateMetrics(Update::flags & update_flags)
pm.setPosition(y1);
tm.updatePosCache(pit1);
y1 -= pm.ascent();
if (pit1 == 0)
break;
--pit1;
}
// Redo paragraphs below the anchor if necessary.

6
src/Compare.cpp
View File

@ -881,10 +881,10 @@ void Compare::Impl::writeToDestBuffer(DocRange const & range,
void Compare::Impl::writeToDestBuffer(ParagraphList const & pars) const
{
pit_type const pit = dest_pars_->size() - 1;
dest_pars_->insert(dest_pars_->end(), pars.begin(), pars.end());
pit_type pit = dest_pars_->size();
if (pit > 0)
mergeParagraph(dest_buf_->params(), *dest_pars_, pit - 1);
if (pit >= 0)
mergeParagraph(dest_buf_->params(), *dest_pars_, pit);
}

3
src/RowPainter.cpp
View File

@ -60,7 +60,8 @@ RowPainter::RowPainter(PainterInfo & pi,
//lyxerr << "RowPainter: x: " << x_ << " xo: " << xo_ << " yo: " << yo_ << endl;
//row_.dump();
LBUFERR(row.pit() < text.paragraphs().size());
LBUFERR(row.pit() >= 0);
LBUFERR(row.pit() < int(text.paragraphs().size()));
}

8
src/support/lstrings.cpp
View File

@ -1507,14 +1507,6 @@ docstring bformat(docstring const & fmt, unsigned int arg1)
}
docstring bformat(docstring const & fmt, pit_type arg1)
{
LATTEST(contains(fmt, from_ascii("%1$d")));
docstring const str = subst(fmt, from_ascii("%1$d"), convert<docstring>(arg1));
return subst(str, from_ascii("%%"), from_ascii("%"));
}
docstring bformat(docstring const & fmt, docstring const & arg1)
{
LATTEST(contains(fmt, from_ascii("%1$s")));

2
src/support/lstrings.h
View File

@ -17,7 +17,6 @@
#define LSTRINGS_H
#include "support/docstring.h"
#include "support/types.h"
#include <vector>
@ -370,7 +369,6 @@ docstring bformat(docstring const & fmt, long arg1);
docstring bformat(docstring const & fmt, long long arg1);
#endif
docstring bformat(docstring const & fmt, unsigned int arg1);
docstring bformat(docstring const & fmt, pit_type arg1);
docstring bformat(docstring const & fmt, docstring const & arg1);
docstring bformat(docstring const & fmt, char * arg1);
docstring bformat(docstring const & fmt, docstring const & arg1, docstring const & arg2);

2
src/support/types.h
View File

@ -40,7 +40,7 @@ namespace lyx {
*/
// FIXME: should be unsigned as well.
// however, simply changing it breaks a downward loop somewhere...
typedef size_t pit_type;
typedef ptrdiff_t pit_type;
/// a type for the nesting depth of a paragraph
typedef size_t depth_type;