anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #10911.

Browse Source
This commit is contained in:
Richard Heck 2018-02-23 23:42:32 -05:00
parent 0f812b0e41
commit 854e7151e3
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Cursor.cpp
View File

@ -2104,15 +2104,15 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
// with and without selection are handled differently
if (!selection()) {
int yo = bv().getPos(*this).y_;
int yo1 = bv().getPos(*this).y_;
Cursor old = *this;
// To next/previous row
// FIXME: the y position is often guessed wrongly across styles and
// insets, which leads to weird behaviour.
if (up)
tm.editXY(*this, xo, yo - textRow().ascent() - 1);
tm.editXY(*this, xo, yo1 - textRow().ascent() - 1);
else
tm.editXY(*this, xo, yo + textRow().descent() + 1);
tm.editXY(*this, xo, yo1 + textRow().descent() + 1);
x_target_ = old.x_target_;
clearSelection();
@ -2140,10 +2140,10 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
--next_row;
} else if (pit() > 0) {
--pit();
TextMetrics & tm = bv_->textMetrics(text());
if (!tm.contains(pit()))
tm.newParMetricsUp();
ParagraphMetrics const & pmcur = tm.parMetrics(pit());
TextMetrics & tm2 = bv_->textMetrics(text());
if (!tm2.contains(pit()))
tm2.newParMetricsUp();
ParagraphMetrics const & pmcur = tm2.parMetrics(pit());
next_row = pmcur.rows().size() - 1;
}
} else {
@ -2151,9 +2151,9 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
++next_row;
} else if (pit() + 1 < int(text()->paragraphs().size())) {
++pit();
TextMetrics & tm = bv_->textMetrics(text());
if (!tm.contains(pit()))
tm.newParMetricsDown();
TextMetrics & tm2 = bv_->textMetrics(text());
if (!tm2.contains(pit()))
tm2.newParMetricsDown();
next_row = 0;
}
}