Revert "Don't asssert on (too) deeply nested items"

[features.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index b2fa1c028349ba23c3ff9f6bcac8f476319398a4..210200a47c1dc7356653e755846df73a534458e0 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -155,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.
@@ -205,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.