* GuiDocument.cpp: before accessing the buffer() in paramsToDialog(), check

[lyx.git] / src / TextMetrics.h

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index bb9d7bd6c122ccc207390695e4f68bd01a3a3a83..32282f76ce9449067ba082c4d2b4803153c7a31c 100644 (file)
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author John Levon
  * \author Abdelrazak Younes
  *
@@ -144,10 +144,10 @@ private:
 
        /// sets row.end to the pos value *after* which a row should break.
        /// for example, the pos after which isNewLine(pos) == true
-       pit_type rowBreakPoint(
+       pos_type rowBreakPoint(
                int width,
                pit_type const pit,
-               pit_type first
+               pos_type first
                ) const;
 
        /// returns the minimum space a row needs on the screen in pixel
@@ -160,8 +160,7 @@ private:
 
        /// draw selection for a single row
        void drawRowSelection(PainterInfo & pi, int x, Row const & row,
-               DocIterator const & beg, DocIterator const & end, 
-               bool drawOnBegMargin, bool drawOnEndMargin) const;
+               Cursor const & cur, pit_type const pit) const;
 
 // Temporary public:
 public:
@@ -177,11 +176,11 @@ public:
        // FIXME: is there a need for this?
        //int pos2x(pit_type pit, pos_type pos) const;
 
-       /** returns row near the specified
-         * y-coordinate in given paragraph (relative to the screen).
-         */
-       Row const & getRowNearY(int y,
-               pit_type pit) const;
+       /// returns the row near the specified y-coordinate in a given paragraph
+       /// (relative to the screen). If assert_in_view is true, it is made sure
+       /// that the row is on screen completely; this might change the given pit.
+       Row const & getPitAndRowNearY(int & y, pit_type & pit,
+               bool assert_in_view, bool up);
 
        /// returns the paragraph number closest to screen y-coordinate.
        /// This method uses the BufferView CoordCache to locate the
@@ -194,11 +193,16 @@ public:
        /**
        \return the inset pointer if x,y is covering that inset
        \param x,y are absolute screen coordinates.
+       \param assert_in_view if true the cursor will be set on a row
+           that is completely visible
+    \param up whether we are going up or down (only used when
+           assert_in_view is true
        \retval inset is non-null if the cursor is positionned inside
        */
        /// FIXME: cleanup to use BufferView::getCoveringInset() and
        /// setCursorFromCoordinates() instead of checkInsetHit().
-       Inset * editXY(Cursor & cur, int x, int y);
+       Inset * editXY(Cursor & cur, int x, int y,
+               bool assert_in_view = false, bool up = true);
 
        /// sets cursor only within this Text.
        /// x,y are screen coordinates
@@ -211,10 +215,6 @@ public:
        int cursorY(CursorSlice const & cursor,
                bool boundary) const;
 
-       ///
-       void cursorPrevious(Cursor & cur);
-       ///
-       void cursorNext(Cursor & cur);
        ///
        bool cursorHome(Cursor & cur);
        ///
@@ -242,6 +242,10 @@ public:
        int leftMargin(int max_width, pit_type pit, pos_type pos) const;
        int leftMargin(int max_width, pit_type pit) const;
 
+       /// calculates the position of a completion popup
+       void completionPosAndDim(Cursor const & cur, int & x, int & y, 
+               Dimension & dim) const;
+
 private:
        friend class BufferView;