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

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index ec36bff31c..34eda6b2de 100644
--- 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 *);
 	
@@ -58,11 +51,10 @@ public:
 
 	///
 	Dimension const & dimension() const { return dim_; }
-
+	///
 	Point const & origin() const { return origin_; }
 
 
-
 	/// compute text metrics.
 	bool metrics(MetricsInfo & mi, Dimension & dim, int min_width = 0);
 
@@ -125,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;
@@ -136,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;
 
@@ -165,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
@@ -257,6 +242,7 @@ public:
 	int leftMargin(int max_width, pit_type pit) const;
 
 private:
+	friend class BufferView;
 
 	/// The BufferView owner.
 	BufferView * bv_;