Fulfill promise to Andre: TextClass_ptr --> TextClassPtr.

[lyx.git] / src / TextMetrics.h

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index d850074310fd8d152bda4908a87aba64b90a4c09..522d5ef54dd46dae9569ffbd599763ea6071950b 100644 (file)
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -15,6 +15,9 @@
 #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"
@@ -40,14 +43,33 @@ public:
        TextMetrics(): text_(0) {}
        /// The only useful constructor.
        TextMetrics(BufferView *, Text *);
+       
+       ///
+       bool has(pit_type pit) const;
        ///
        ParagraphMetrics const & parMetrics(pit_type) const;
        ///
-       Dimension const & dimension() const;
-       Dimension const & dimension();
+       std::pair<pit_type, ParagraphMetrics> const & first() const;
+       ///
+       std::pair<pit_type, ParagraphMetrics> const & last() 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.
@@ -107,8 +129,6 @@ public:
 
        ///
        void draw(PainterInfo & pi, int x, int y) const;
-       /// draw textselection
-       void drawSelection(PainterInfo & pi, int x, int y) const;
        
        void drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) const;
 
@@ -116,6 +136,13 @@ 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;
 
@@ -245,16 +272,7 @@ private:
        mutable ParMetricsCache par_metrics_;
        Dimension dim_;
        int max_width_;
-
-       /// FIXME: transfer this code in CoordCache here.
-       /*
-       /// A map from paragraph index number to screen point
-       typedef std::map<pit_type, Point> InnerParPosCache;
-       /// A map from a Text to the map of paragraphs to screen points
-       typedef std::map<Text const *, InnerParPosCache> ParPosCache;
-       /// Paragraph grouped by owning text
-       ParPosCache pars_;
-       */
+       mutable Point origin_;
 
 // temporary public:
 public: