reduce line noise

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31864 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Edwin Leuven 2009-11-05 19:51:17 +00:00
parent 5ebc733ff3
commit c5b63235f0

View File

@ -1841,8 +1841,6 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
if (up) { if (up) {
if (row > 0) { if (row > 0) {
--next_row; --next_row;
top().pos()
= min(tm.x2pos(pit(), next_row, xo), top().lastpos());
} else if (pit() > 0) { } else if (pit() > 0) {
--pit(); --pit();
TextMetrics & tm = bv_->textMetrics(text()); TextMetrics & tm = bv_->textMetrics(text());
@ -1850,24 +1848,19 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
tm.newParMetricsUp(); tm.newParMetricsUp();
ParagraphMetrics const & pmcur = tm.parMetrics(pit()); ParagraphMetrics const & pmcur = tm.parMetrics(pit());
next_row = pmcur.rows().size() - 1; next_row = pmcur.rows().size() - 1;
top().pos()
= min(tm.x2pos(pit(), next_row, xo), top().lastpos());
} }
} else { } else {
if (row + 1 < int(pm.rows().size())) { if (row + 1 < int(pm.rows().size())) {
++next_row; ++next_row;
top().pos()
= min(tm.x2pos(pit(), next_row, xo), top().lastpos());
} else if (pit() + 1 < int(text()->paragraphs().size())) { } else if (pit() + 1 < int(text()->paragraphs().size())) {
++pit(); ++pit();
TextMetrics & tm = bv_->textMetrics(text()); TextMetrics & tm = bv_->textMetrics(text());
if (!tm.contains(pit())) if (!tm.contains(pit()))
tm.newParMetricsDown(); tm.newParMetricsDown();
next_row = 0; next_row = 0;
top().pos()
= min(tm.x2pos(pit(), next_row, xo), top().lastpos());
} }
} }
top().pos() = min(tm.x2pos(pit(), next_row, xo), top().lastpos());
boundary(tm.x2pos(pit(), next_row, xo) boundary(tm.x2pos(pit(), next_row, xo)
== tm.x2pos(pit(), next_row, tm.width())); == tm.x2pos(pit(), next_row, tm.width()));