Revert 23154.

[lyx.git] / src / TextMetrics.h

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 34eda6b2de971a1e01ddf60ebb75cabfab734896..617b716865dd01b9cd1579f2635ac3a3398d81c2 100644 (file)
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -124,6 +124,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 +151,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,13 +159,6 @@ 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,