Change TextMetrics::rowHeight to setRowHeight

[features.git] / src / TextMetrics.h

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 9dd68558e910b719919933c6943f4535088cafc5..39fd2dac64a44f2c440b274badbdf065ac81010d 100644 (file)
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -15,6 +15,7 @@
 #define TEXT_METRICS_H
 
 #include "Font.h"
+#include "InsetList.h"
 #include "ParagraphMetrics.h"
 
 #include "support/types.h"
@@ -36,7 +37,7 @@ public:
        TextMetrics() : text_(0) {}
        /// The only useful constructor.
        TextMetrics(BufferView *, Text *);
-       
+
        ///
        bool contains(pit_type pit) const;
        ///
@@ -46,9 +47,6 @@ public:
        ///
        std::pair<pit_type, ParagraphMetrics const *> last() const;
 
-       ///
-       int parPosition(pit_type pit) const;
-
        ///
        Dimension const & dimension() const { return dim_; }
        ///
@@ -102,7 +100,7 @@ public:
        int descent() const { return dim_.des; }
        /// current text width.
        int width() const { return dim_.wid; }
-       /// current text heigth.
+       /// current text height.
        int height() const { return dim_.height(); }
 
        ///
@@ -126,11 +124,8 @@ public:
        /// 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;
+       void setRowHeight(Row & row, pit_type const pit, 
+                         bool topBottomSpace = true) const;
 
 private:
        ///
@@ -144,11 +139,7 @@ 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(
-               int width,
-               pit_type const pit,
-               pit_type first
-               ) const;
+       void breakRow(Row & row, int right_margin, pit_type const pit) const;
 
        /// returns the minimum space a row needs on the screen in pixel
        int rowWidth(
@@ -158,9 +149,9 @@ private:
                pos_type const end
                ) const;
 
-       /// draw selection for a single row
-       void drawRowSelection(PainterInfo & pi, int x, Row const & row,
-               Cursor const & cur, pit_type const pit) const;
+       // Helper function for the other checkInsetHit method.
+       InsetList::InsetTable * checkInsetHit(pit_type pit, int x, int y);
+
 
 // Temporary public:
 public:
@@ -179,7 +170,7 @@ public:
        /// 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,
+       Row const & getPitAndRowNearY(int & y, pit_type & pit,
                bool assert_in_view, bool up);
 
        /// returns the paragraph number closest to screen y-coordinate.