Revert "Use swap in InsetText::updateBuffer for notes ad friends"

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index a5222599f2cf983f7dc514c53d39ffee8e6e6a48..2478e609349857d2ae1ce47c28f8c8891caff053 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -114,17 +114,23 @@ 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;
 
        /// \return true if the BufferView is at the bottom of the document.
        bool isBottomScreen() const;
 
-       /// perform pending metrics updates.
-       /** \c Update::FitCursor means first to do a FitCursor, and to
+       /// Add \p flags to current update flags and trigger an update.
+       /* If this method is invoked several times before the update
+        * actually takes place, the effect is cumulative.
+        * \c Update::FitCursor means first to do a FitCursor, and to
         * force an update if screen position changes.
         * \c Update::Force means to force an update in any case.
-        * \retval true if a screen redraw is needed
         */
        void processUpdateFlags(Update::flags flags);
 
@@ -132,9 +138,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;
@@ -250,9 +253,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.
@@ -307,6 +307,8 @@ public:
        bool paragraphVisible(DocIterator const & dit) const;
        /// is the cursor currently visible in the view
        bool cursorInView(Point const & p, int h) const;
+       /// set the ascent and descent of the caret
+       void setCaretAscentDescent(int asc, int des);
        /// get the position and height of the caret
        void caretPosAndHeight(Point & p, int & h) const;
 
@@ -367,6 +369,8 @@ private:
        /// Update current paragraph metrics.
        /// \return true if no further update is needed.
        bool singleParUpdate();
+       /// do the work for the public updateMetrics()
+       void updateMetrics(Update::flags & update_flags);
 
        // Set the row on which the cursor lives.
        void setCurrentRowSlice(CursorSlice const & rowSlice);