X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.h;h=78825c39852b5fb7eeda060d306649fb70f86aa3;hb=4a75fe0310ac64a079edab0c07d8f8eebaf519c0;hp=6571bc72be647b179bee304e73c117569a48be90;hpb=8d52aa563813f53eeca109c76252d3a258214017;p=lyx.git

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 6571bc72be..78825c3985 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,31 +33,30 @@ 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;
+	bool contains(pit_type pit) const;
 	///
 	ParagraphMetrics const & parMetrics(pit_type) const;
 	///
-	std::pair<pit_type, ParagraphMetrics> const & first() const;
+	std::pair<pit_type, ParagraphMetrics const *> first() const;
 	///
-	std::pair<pit_type, ParagraphMetrics> const & last() const;
+	std::pair<pit_type, ParagraphMetrics const *> last() const;
 
 	///
 	int parPosition(pit_type pit) const;
 
 	///
-	Dimension const & dimension() 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();
@@ -76,8 +68,7 @@ public:
 	/// The difference is that this one is used for displaying, and thus we
 	/// are allowed to make cosmetic improvements. For instance make footnotes
 	/// smaller. (Asger)
-	Font getDisplayFont(pit_type pit,
-		pos_type pos) const;
+	Font displayFont(pit_type pit, pos_type pos) const;
 
 	/// There are currently two font mechanisms in LyX:
 	/// 1. The font attributes in a lyxtext, and
@@ -125,24 +116,26 @@ 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;
 	
 	void drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) const;
 
+	/// 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;
+
 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;
 
@@ -157,7 +150,7 @@ private:
 		pit_type first
 		) const;
 
-	/// sets row.width to the minimum space a row needs on the screen in pixel
+	/// returns the minimum space a row needs on the screen in pixel
 	int rowWidth(
 		int right_margin,
 		pit_type const pit,
@@ -165,17 +158,9 @@ private:
 		pos_type const end
 		) const;
 
-	/// Calculate and set the height of the row
-	boost::tuple<int, int> rowHeight(
-		pit_type const pit,
-		pos_type const first,
-		pos_type const end
-		) const;
-
 	/// draw selection for a single row
 	void drawRowSelection(PainterInfo & pi, int x, Row const & row,
-		DocIterator const & beg, DocIterator const & end, 
-		bool drawOnBegMargin, bool drawOnEndMargin) const;
+		Cursor const & cur, pit_type const pit) const;
 
 // Temporary public:
 public:
@@ -225,10 +210,6 @@ public:
 	int cursorY(CursorSlice const & cursor,
 		bool boundary) const;
 
-	///
-	void cursorPrevious(Cursor & cur);
-	///
-	void cursorNext(Cursor & cur);
 	///
 	bool cursorHome(Cursor & cur);
 	///
@@ -256,7 +237,12 @@ public:
 	int leftMargin(int max_width, pit_type pit, pos_type pos) const;
 	int leftMargin(int max_width, pit_type pit) const;
 
+	/// calculates the position of a completion popup
+	void completionPosAndDim(Cursor const & cur, int & x, int & y, 
+		Dimension & dim) const;
+
 private:
+	friend class BufferView;
 
 	/// The BufferView owner.
 	BufferView * bv_;