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

diff --git a/src/BufferView.h b/src/BufferView.h
index ab5ba60028..6cdc68534b 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -57,6 +57,16 @@ enum CursorStatus {
 	CUR_BELOW
 };
 
+/// How to show cursor
+enum ScrollType {
+	// Make sure row if visible (do nothing if it is visible already)
+	SCROLL_VISIBLE,
+	// Force cursor to be on top of screen
+	SCROLL_TOP,
+	// Force cursor to be at center of screen
+	SCROLL_CENTER
+};
+
 /// Scrollbar Parameters.
 struct ScrollbarParameters
 {
@@ -101,6 +111,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 +165,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 +176,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
@@ -196,17 +211,17 @@ public:
 	/// This method will automatically scroll and update the BufferView
 	/// (metrics+drawing) if needed.
 	void showCursor();
+
 	/// Ensure the passed cursor \p dit is visible.
 	/// 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,
-		bool update);
-	/// Scroll to the cursor.
-	void scrollToCursor();
+	/// \param how Use this scroll strategy
+	/// \param force If true, update screen after scrolling
+	void showCursor(DocIterator const & dit, ScrollType how, bool update);
 	/// Scroll to the cursor.
-	/// \param recenter Whether the cursor should be centered on screen
-	bool scrollToCursor(DocIterator const & dit, bool recenter);
+	/// \param how Use this scroll strategy
+	/// \return true if screen was scrolled
+	bool scrollToCursor(DocIterator const & dit, ScrollType how);
 	/// scroll down document by the given number of pixels.
 	int scrollDown(int pixels);
 	/// scroll up document by the given number of pixels.
@@ -370,6 +385,8 @@ public:
 	bool clickableInset() const;
 	///
 	void makeDocumentClass();
+	/// Are we currently performing a selection with the mouse?
+	bool mouseSelecting() const;
 
 private:
 	/// noncopyable