X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=6aa2f067778cb41fe3d094a2fcd1c8cf520949e0;hb=c6e1db7682dc8d58a68147b5eee1d004829ef6d2;hp=f24af0d21ed5cdf0b465173377f572d5592822cc;hpb=8c69aca339dd3fde674ed6a91034d9115d9710ad;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index f24af0d21e..6aa2f06777 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -15,6 +15,7 @@
 #ifndef BUFFER_VIEW_H
 #define BUFFER_VIEW_H
 
+#include "DocumentClassPtr.h"
 #include "update_flags.h"
 
 #include "support/strfwd.h"
@@ -31,6 +32,7 @@ class Buffer;
 class Change;
 class CoordCache;
 class Cursor;
+class CursorSlice;
 class DispatchResult;
 class DocIterator;
 class DocumentClass;
@@ -38,6 +40,7 @@ class FuncRequest;
 class FuncStatus;
 class Intl;
 class Inset;
+class PainterInfo;
 class ParIterator;
 class ParagraphMetrics;
 class Point;
@@ -117,6 +120,17 @@ public:
 	/// move the screen to fit the cursor.
 	/// Only to be called with good y coordinates (after a bv::metrics)
 	bool fitCursor();
+
+	// Returns the amount of horizontal scrolling applied to the
+	// top-level row where the cursor lies
+	int horizScrollOffset() const;
+
+	// Points to the top-level row where the cursor lies (during draw).
+	CursorSlice const & currentRowSlice() const;
+
+	// Points to the top-level row where the cursor lied at last draw event.
+	CursorSlice const & lastRowSlice() const;
+
 	/// reset the scrollbar to reflect current view position.
 	void updateScrollbar();
 	/// return the Scrollbar Parameters.
@@ -154,7 +168,7 @@ public:
 	/// Ensure that the BufferView cursor is visible.
 	/// This method will automatically scroll and update the BufferView
 	/// if needed.
-	void showCursor(); 
+	void showCursor();
 	/// Ensure the passed cursor \p dit is visible.
 	/// This method will automatically scroll and update the BufferView
 	/// if needed.
@@ -166,8 +180,6 @@ public:
 	/// Scroll to the cursor.
 	/// \param recenter Whether the cursor should be centered on screen
 	bool scrollToCursor(DocIterator const & dit, bool recenter);
-	/// LFUN_SCROLL Helper.
-	void lfunScroll(FuncRequest const & cmd);
 	/// scroll down document by the given number of pixels.
 	int scrollDown(int pixels);
 	/// scroll up document by the given number of pixels.
@@ -318,6 +330,8 @@ public:
 	void clearLastInset(Inset * inset) const;
 	/// Is the mouse hovering a clickable inset or element?
 	bool clickableInset() const;
+	///
+	void makeDocumentClass();
 
 private:
 	/// noncopyable
@@ -330,11 +344,18 @@ private:
 	/// \return true if no further update is needed.
 	bool singleParUpdate();
 
+	// Set the row on which the cursor lives.
+	void setCurrentRowSlice(CursorSlice const & rowSlice);
+
+	// Check whether the row where the cursor lives needs to be scrolled.
+	// Update the drawing strategy if needed.
+	void checkCursorScrollOffset(PainterInfo & pi);
+
 	/// The minimal size of the document that is visible. Used
 	/// when it is allowed to scroll below the document.
 	int minVisiblePart();
 
-	/// Search recursively for the the innermost inset that covers (x, y) position.
+	/// Search recursively for the innermost inset that covers (x, y) position.
 	/// \retval 0 if no inset is found.
 	Inset const * getCoveringInset(
 		Text const & text, //< The Text where we start searching.
@@ -347,7 +368,7 @@ private:
 	void updateHoveredInset() const;
 
 	///
-	void updateDocumentClass(DocumentClass const * const olddc);
+	void updateDocumentClass(DocumentClassConstPtr olddc);
 	///
 	int width_;
 	///