X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.h;h=34eda6b2de971a1e01ddf60ebb75cabfab734896;hb=fc2658eff011adb08192cf897416698c34aab268;hp=d850074310fd8d152bda4908a87aba64b90a4c09;hpb=2ea432bab156751d40f2909f73db857942cfa143;p=lyx.git

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index d850074310..34eda6b2de 100644
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -19,15 +19,11 @@
 
 #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;
@@ -37,17 +33,35 @@ class TextMetrics
 {
 public:
 	/// Default constructor (only here for STL containers).
-	TextMetrics(): text_(0) {}
+	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.
@@ -103,12 +117,10 @@ 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;
-	/// draw textselection
-	void drawSelection(PainterInfo & pi, int x, int y) const;
 	
 	void drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) const;
 
@@ -138,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
@@ -230,6 +242,7 @@ public:
 	int leftMargin(int max_width, pit_type pit) const;
 
 private:
+	friend class BufferView;
 
 	/// The BufferView owner.
 	BufferView * bv_;
@@ -245,16 +258,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: