Transfer current_font and real_current_font from Text to Cursor.

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index 8cb5725ee1010570f6f5ead0e63a27bb430738c4..4217901c908fbda3182d045ca6932952c4a19fd8 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -35,6 +35,8 @@ namespace lyx {
 
 namespace support { class FileName; }
 
+namespace frontend { class Painter; }
+
 class Buffer;
 class Change;
 class DocIterator;
@@ -107,9 +109,9 @@ public:
        /// Save the current position as bookmark.
        /// if idx == 0, save to temp_bookmark
        void saveBookmark(unsigned int idx);
-       /// goto a specified position, try top_id first, and then bottom_pit
-       /// return the bottom_pit and top_id of the new paragraph
-       boost::tuple<pit_type, pos_type, int> moveToPosition(
+       /// goto a specified position, try top_id first, and then bottom_pit.
+       /// \return true if success
+       bool moveToPosition(
                pit_type bottom_pit, ///< Paragraph pit, used when par_id is zero or invalid.
                pos_type bottom_pos, ///< Paragraph pit, used when par_id is zero or invalid.
                int top_id, ///< Paragraph ID, \sa Paragraph
@@ -153,10 +155,9 @@ public:
        /// clear the X11 selection.
        void clearSelection();
 
-       /// resize method helper for \c WorkArea
+       /// resize the BufferView.
        /// \sa WorkArea
-       /// \sa resise
-       void workAreaResize(int width, int height);
+       void resize(int width, int height);
 
        /// dispatch method helper for \c WorkArea
        /// \sa WorkArea
@@ -212,6 +213,10 @@ public:
        CoordCache const & coordCache() const {
                return coord_cache_;
        }
+
+       ///
+       void draw(frontend::Painter & pain);
+
        /// get this view's keyboard map handler.
        Intl & getIntl() { return *intl_.get(); }
        ///
@@ -300,6 +305,14 @@ private:
        mutable TextMetricsCache text_metrics_;
 };
 
+/// some space for drawing the 'nested' markers (in pixel)
+inline int nestMargin() { return 15; }
+
+/// margin for changebar
+inline int changebarMargin() { return 12; }
+
+/// right margin
+inline int rightMargin() { return 10; }
 
 } // namespace lyx