getting rid of more superfluous lyx::support:: statements.

[lyx.git] / src / TextMetrics.h

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 2d7c09fffa5d51dd76290a02bf134628123e4823..fccb2678b75d9da9b7aa285eec87f99a3e5c4d74 100644 (file)
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -15,22 +15,15 @@
 #define TEXT_METRICS_H
 
 #include "Font.h"
-// FIXME: We only need Point class definition, not the full
-// CoordCache.
-#include "CoordCache.h"
 #include "ParagraphMetrics.h"
 
 #include "support/types.h"
 
-#include <boost/utility.hpp>
-#include <boost/tuple/tuple.hpp>
-
-#include <map>
-
-
 namespace lyx {
 
 class BufferView;
+class Cursor;
+class CursorSlice;
 class DocIterator;
 class MetricsInfo;
 class Text;
@@ -40,7 +33,7 @@ class TextMetrics
 {
 public:
        /// Default constructor (only here for STL containers).
-       TextMetrics(): text_(0) {}
+       TextMetrics() : text_(0) {}
        /// The only useful constructor.
        TextMetrics(BufferView *, Text *);
        
@@ -49,16 +42,26 @@ public:
        ///
        ParagraphMetrics const & parMetrics(pit_type) const;
        ///
-       int parPosition(pit_type pit) const;
+       std::pair<pit_type, ParagraphMetrics const *> first() const;
+       ///
+       std::pair<pit_type, ParagraphMetrics const *> last() const;
 
        ///
-       Dimension const & dimension() const;
+       int parPosition(pit_type pit) const;
 
+       ///
+       Dimension const & dimension() const { return dim_; }
+       ///
        Point const & origin() const { return origin_; }
 
 
        /// compute text metrics.
-       bool metrics(MetricsInfo & mi, Dimension & dim);
+       bool metrics(MetricsInfo & mi, Dimension & dim, int min_width = 0);
+
+       ///
+       void newParMetricsDown();
+       ///
+       void newParMetricsUp();
 
        /// Gets the fully instantiated font at a given position in a paragraph
        /// Basically the same routine as Paragraph::getFont() in Paragraph.cpp.
@@ -114,7 +117,7 @@ public:
 
        /** this calculates the specified parameters. needed when setting
         * the cursor and when creating a visible row */
-       void computeRowMetrics(pit_type pit, Row & row) const;
+       void computeRowMetrics(pit_type pit, Row & row, int width) const;
 
        ///
        void draw(PainterInfo & pi, int x, int y) const;
@@ -125,13 +128,6 @@ private:
        ///
        ParagraphMetrics & parMetrics(pit_type, bool redo_paragraph);
 
-       /// draw textselection.
-       /// FIXME: simplify to just to single row painting.
-       void drawSelection(PainterInfo & pi,
-               DocIterator const & beg, ///< selection begin.
-               DocIterator const & end, ///< selection end.
-               int x) const;
-
        /// the minimum space a manual label needs on the screen in pixels
        int labelFill(pit_type const pit, Row const & row) const;
 
@@ -154,8 +150,8 @@ private:
                pos_type const end
                ) const;
 
-       /// Calculate and set the height of the row
-       boost::tuple<int, int> rowHeight(
+       /// 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