X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=5bad57ca0ece1d8d88c4017fe9ffd516cb99dc07;hb=cd4ae51f7787046e8852abc4b339b5191c6adc16;hp=7f0bcca9e4afb45f6ebd4ff26cd8af101910eba8;hpb=c19c54dd5b85726df1b5187616d17d5430028c16;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index 7f0bcca9e4..5bad57ca0e 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -114,13 +114,18 @@ public:
 	 */
 	int inPixels(Length const & len) const;
 
+	/** Return the number of pixels equivalent to \c pix pixels at
+	 * 100dpi and 100% zoom.
+	 */
+	int zoomedPixels(int pix) const;
+
 	/// \return true if the BufferView is at the top of the document.
 	bool isTopScreen() const;
 
 	/// \return true if the BufferView is at the bottom of the document.
 	bool isBottomScreen() const;
 
-	/// Add \p flags to current updte flags and trigger an update.
+	/// Add \p flags to current update flags and trigger an update.
 	/* If this method is invoked several times before the update
 	 * actually takes place, the effect is cumulative.
 	 * \c Update::FitCursor means first to do a FitCursor, and to
@@ -133,9 +138,6 @@ public:
 	/// Only to be called with good y coordinates (after a bv::metrics)
 	bool needsFitCursor() const;
 
-	/// returns true if this row needs to be repainted (to erase caret)
-	bool needRepaint(Text const * text, Row const & row) const;
-
 	// Returns the amount of horizontal scrolling applied to the
 	// top-level row where the cursor lies
 	int horizScrollOffset() const;
@@ -144,11 +146,6 @@ public:
 	int horizScrollOffset(Text const * text,
 	                      pit_type pit, pos_type pos) const;
 
-	// Returns true if the row of text starting at (pit, pos) was scrolled
-	// at the last draw event.
-	bool hadHorizScrollOffset(Text const * text,
-                              pit_type pit, pos_type pos) const;
-
 	/// reset the scrollbar to reflect current view position.
 	void updateScrollbar();
 	/// return the Scrollbar Parameters.
@@ -251,9 +248,6 @@ public:
 	/// \sa WorkArea
 	void mouseEventDispatch(FuncRequest const & ev);
 
-	/// access to anchor.
-	pit_type anchor_ref() const;
-
 	///
 	CursorStatus cursorStatus(DocIterator const & dit) const;
 	/// access to full cursor.
@@ -308,6 +302,8 @@ public:
 	bool paragraphVisible(DocIterator const & dit) const;
 	/// is the cursor currently visible in the view
 	bool cursorInView(Point const & p, int h) const;
+	/// set the ascent and descent of the caret
+	void setCaretAscentDescent(int asc, int des);
 	/// get the position and height of the caret
 	void caretPosAndHeight(Point & p, int & h) const;
 
@@ -368,6 +364,8 @@ private:
 	/// Update current paragraph metrics.
 	/// \return true if no further update is needed.
 	bool singleParUpdate();
+	/// do the work for the public updateMetrics()
+	void updateMetrics(Update::flags & update_flags);
 
 	// Set the row on which the cursor lives.
 	void setCurrentRowSlice(CursorSlice const & rowSlice);