[LyX/master] Revert "Make sure that top/bottom margins are visible when needed"

Jean-Marc Lasgouttes lasgouttes at lyx.org
Tue Feb 16 11:26:09 UTC 2021


commit f6c87c63c1b250992aa2511b80362dafbc48de13
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date:   Tue Feb 16 09:27:11 2021 +0100

    Revert "Make sure that top/bottom margins are visible when needed"
    
    This reverts commit a78eb4471f2577cfa2fa89b27d27013c68937a17.
---
 src/BufferView.cpp |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 0657236..0025277 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -977,15 +977,8 @@ bool BufferView::scrollToCursor(DocIterator const & dit, bool const recenter)
 		CursorSlice const & cs = dit.innerTextSlice();
 		int offset = coordOffset(dit).y_;
 		int ypos = pm.position() + offset;
-		Row const & row = pm.getRow(cs.pos(), dit.boundary());
-		Dimension row_dim = row.dim();
-		// FIXME: the will not be necessary anymore if Row has both a
-		// dim() which is its full dimension and a contentsDim() which
-		// is the dimension of the text only.
-		if (&row == &pm.rows().front())
-			row_dim.asc = pm.ascent();
-		if (&row == &pm.rows().back())
-			row_dim.des = pm.descent();
+		Dimension const & row_dim =
+			pm.getRow(cs.pos(), dit.boundary()).dim();
 		int scrolled = 0;
 		if (recenter)
 			scrolled = scroll(ypos - height_/2);


More information about the lyx-cvs mailing list