More requires --> required, for C++2a.

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index 3cbf22a8ba48d1c7270b46025393456caedbe44f..40dd0d29c352a4496ef0b3301b2910fda1c67226 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -42,6 +42,8 @@ class FuncStatus;
 class Intl;
 class Inset;
 class Length;
+class MathData;
+class MathRow;
 class ParIterator;
 class ParagraphMetrics;
 class Point;
@@ -114,6 +116,11 @@ 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;
 
@@ -133,9 +140,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 +148,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 +250,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.
@@ -302,12 +298,17 @@ public:
        ///
        CoordCache const & coordCache() const;
 
+       ///
+       MathRow const & mathRow(MathData const * cell) const;
+       ///
+       void setMathRow(MathData const * cell, MathRow const & mrow);
+
        ///
        Point getPos(DocIterator const & dit) const;
        /// is the paragraph of the cursor visible ?
        bool paragraphVisible(DocIterator const & dit) const;
-       /// is the cursor currently visible in the view
-       bool cursorInView(Point const & p, int h) const;
+       /// is the caret currently visible in the view
+       bool caretInView() const;
        /// get the position and height of the caret
        void caretPosAndHeight(Point & p, int & h) const;
 
@@ -344,7 +345,7 @@ public:
        // Insert plain text file (if filename is empty, prompt for one)
        void insertPlaintextFile(support::FileName const & f, bool asParagraph);
        ///
-       void insertLyXFile(support::FileName const & f);
+       void insertLyXFile(support::FileName const & f, bool const ignorelang = false);
        /// save temporary bookmark for jump back navigation
        void bookmarkEditPosition();
        /// Find and return the inset associated with given dialog name.