update the ACM SIGPLAN files to latest layout and fileformat

[lyx.git] / src / TextMetrics.h

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 80fa4fe07f57b7bcb0f8c9a52aa3c32191779565..78825c39852b5fb7eeda060d306649fb70f86aa3 100644 (file)
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -38,7 +38,7 @@ public:
        TextMetrics(BufferView *, Text *);
        
        ///
-       bool has(pit_type pit) const;
+       bool contains(pit_type pit) const;
        ///
        ParagraphMetrics const & parMetrics(pit_type) const;
        ///
@@ -68,8 +68,7 @@ public:
        /// The difference is that this one is used for displaying, and thus we
        /// are allowed to make cosmetic improvements. For instance make footnotes
        /// smaller. (Asger)
-       Font getDisplayFont(pit_type pit,
-               pos_type pos) const;
+       Font displayFont(pit_type pit, pos_type pos) const;
 
        /// There are currently two font mechanisms in LyX:
        /// 1. The font attributes in a lyxtext, and
@@ -124,6 +123,15 @@ public:
        
        void drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) const;
 
+       /// Returns the height of the row (width member is set to 0).
+       /// If \c topBottomSpace is true, extra space is added for the
+       /// top and bottom row.
+       Dimension rowHeight(
+               pit_type const pit,
+               pos_type const first,
+               pos_type const end,
+               bool topBottomSpace = true) const;
+
 private:
        ///
        ParagraphMetrics & parMetrics(pit_type, bool redo_paragraph);
@@ -142,7 +150,7 @@ private:
                pit_type first
                ) const;
 
-       /// sets row.width to the minimum space a row needs on the screen in pixel
+       /// returns the minimum space a row needs on the screen in pixel
        int rowWidth(
                int right_margin,
                pit_type const pit,
@@ -150,17 +158,9 @@ private:
                pos_type const end
                ) const;
 
-       /// Calculate and set the height of the row (width member is set to 0)
-       Dimension rowHeight(
-               pit_type const pit,
-               pos_type const first,
-               pos_type const end
-               ) const;
-
        /// 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:
@@ -210,10 +210,6 @@ public:
        int cursorY(CursorSlice const & cursor,
                bool boundary) const;
 
-       ///
-       void cursorPrevious(Cursor & cur);
-       ///
-       void cursorNext(Cursor & cur);
        ///
        bool cursorHome(Cursor & cur);
        ///
@@ -241,9 +237,12 @@ public:
        int leftMargin(int max_width, pit_type pit, pos_type pos) const;
        int leftMargin(int max_width, pit_type pit) const;
 
-private:
+       /// calculates the position of a completion popup
+       void completionPosAndDim(Cursor const & cur, int & x, int & y, 
+               Dimension & dim) const;
 
-       friend BufferView;
+private:
+       friend class BufferView;
 
        /// The BufferView owner.
        BufferView * bv_;