X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.h;h=ad725f2121861a598cc5c724758c4bc214035302;hb=0e4ca9aa88eb7b9351bb563dcd2df59c15744aa5;hp=ab5ba600289d11e65433fdaa4dc1bf83e8822321;hpb=5a43b86141a6630ff87b9f5fdba94187e282d1fe;p=lyx.git

diff --git a/src/BufferView.h b/src/BufferView.h
index ab5ba60028..ad725f2121 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -101,6 +101,8 @@ public:
 	///
 	void setFullScreen(bool full_screen) { full_screen_ = full_screen; }
 
+	/// default value for the margins
+	int defaultMargin() const;
 	/// right margin
 	int rightMargin() const;
 	/// left margin
@@ -153,8 +155,8 @@ public:
 	int horizScrollOffset(Text const * text,
 	                      pit_type pit, pos_type pos) const;
 
-	/// reset the scrollbar to reflect current view position.
-	void updateScrollbar();
+	/// reset the scrollbar parameters to reflect current view position.
+	void updateScrollbarParameters();
 	/// return the Scrollbar Parameters.
 	ScrollbarParameters const & scrollbarParameters() const;
 	/// \return Tool tip for the given position.
@@ -164,6 +166,9 @@ public:
 	/// \return the math inset with a context menu for the given position
 	Inset const * mathContextMenu(InsetMathNest const * inset,
 		CoordCache::Insets const & inset_cache, int x, int y) const;
+	/// \return the clickable math inset for the given position
+	Inset const * clickableMathInset(InsetMathNest const * inset,
+		CoordCache::Insets const & inset_cache, int x, int y) const;
 
 	/// Save the current position as bookmark.
 	/// if idx == 0, save to temp_bookmark
@@ -200,13 +205,13 @@ public:
 	/// This method will automatically scroll and update the BufferView
 	/// (metrics+drawing) if needed.
 	/// \param recenter Whether the cursor should be centered on screen
-	void showCursor(DocIterator const & dit, bool recenter,
+	/// \param force If true, disregard current position
+	void showCursor(DocIterator const & dit, bool recenter, bool force,
 		bool update);
 	/// Scroll to the cursor.
-	void scrollToCursor();
-	/// Scroll to the cursor.
 	/// \param recenter Whether the cursor should be centered on screen
-	bool scrollToCursor(DocIterator const & dit, bool recenter);
+	/// \param force If true, disregard current position
+	bool scrollToCursor(DocIterator const & dit, bool recenter, bool force);
 	/// scroll down document by the given number of pixels.
 	int scrollDown(int pixels);
 	/// scroll up document by the given number of pixels.
@@ -370,6 +375,8 @@ public:
 	bool clickableInset() const;
 	///
 	void makeDocumentClass();
+	/// Are we currently performing a selection with the mouse?
+	bool mouseSelecting() const;
 
 private:
 	/// noncopyable