Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index 6aa2f067778cb41fe3d094a2fcd1c8cf520949e0..b368685c6ea4bf08c7f238a8659eab0f023c824d 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -44,6 +44,7 @@ class PainterInfo;
 class ParIterator;
 class ParagraphMetrics;
 class Point;
+class TexRow;
 class Text;
 class TextMetrics;
 
@@ -56,15 +57,15 @@ enum CursorStatus {
 /// Scrollbar Parameters.
 struct ScrollbarParameters
 {
+       // These parameters are normalized against the screen geometry and pixel
+       // coordinates. Position 0 corresponds to the top the the screen.
        ScrollbarParameters()
-               : min(0), max(0), position(0), single_step(1), page_step(1)
+               : min(0), max(0), single_step(1), page_step(1)
        {}
        /// Minimum scrollbar position in pixels.
        int min;
        /// Maximum scrollbar position in pixels.
        int max;
-       /// Current position in the document in pixels.
-       int position;
        /// Line-scroll amount in pixels.
        int single_step;
        /// Page-scroll amount in pixels.
@@ -117,19 +118,22 @@ public:
         */
        void processUpdateFlags(Update::flags flags);
 
-       /// move the screen to fit the cursor.
+       /// return true if one shall move the screen to fit the cursor.
        /// Only to be called with good y coordinates (after a bv::metrics)
-       bool fitCursor();
+       bool needsFitCursor() const;
 
        // Returns the amount of horizontal scrolling applied to the
        // top-level row where the cursor lies
        int horizScrollOffset() const;
+       // Returns the amount of horizontal scrolling applied to the
+       // row of text starting at (pit, pos)
+       int horizScrollOffset(Text const * text,
+                             pit_type pit, pos_type pos) 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;
+       // 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();
@@ -159,6 +163,8 @@ public:
 
        /// set the cursor based on the given TeX source row.
        void setCursorFromRow(int row);
+       ///
+       void setCursorFromRow(int row, TexRow const & texrow);
 
        /// set cursor to the given inset. Return true if found.
        bool setCursorFromInset(Inset const *);
@@ -167,11 +173,11 @@ public:
        void recenter();
        /// Ensure that the BufferView cursor is visible.
        /// This method will automatically scroll and update the BufferView
-       /// if needed.
+       /// (metrics+drawing) if needed.
        void showCursor();
        /// Ensure the passed cursor \p dit is visible.
        /// This method will automatically scroll and update the BufferView
-       /// if needed.
+       /// (metrics+drawing) if needed.
        /// \param recenter Whether the cursor should be centered on screen
        void showCursor(DocIterator const & dit, bool recenter,
                bool update);