X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_xdata.h;h=b35c062b9a575f02826100cec3fe7d52f511f658;hb=c649284611c4198c9d70be8a16d153cdf1ec0700;hp=0fb7842d66c014307706bfffc544b71c6007f810;hpb=2c3f160f388766968b0496ad0bf52ebce1f83947;p=lyx.git

diff --git a/src/mathed/math_xdata.h b/src/mathed/math_xdata.h
index 0fb7842d66..b35c062b9a 100644
--- a/src/mathed/math_xdata.h
+++ b/src/mathed/math_xdata.h
@@ -12,68 +12,94 @@
 #pragma interface
 #endif
 
-class Painter;
+class MathPainterInfo;
+class TextPainter;
 
+
+/** This class extends a MathArray by drawing routines and caches for
+ * metric information.
+ */
 class MathXArray
 {
 public:
-	///
+	/// type for positions and sizes
 	typedef MathArray::size_type       size_type;
-	///
+	/// const iterator into the underlying MathArray
 	typedef MathArray::const_iterator  const_iterator;
 
-	///
+	/// constructor
 	MathXArray();
-	///
-	void metrics(MathMetricsInfo const & st) const;
-	///
-	void draw(Painter & pain, int x, int y) const;
+	/// rebuild cached metrics information
+	void metrics(MathMetricsInfo & st) const;
+	/// redraw cell using cache metrics information
+	void draw(MathPainterInfo & pain, int x, int y) const;
+	/// rebuild cached metrics information
+	void metricsT(TextMetricsInfo const & st) const;
+	/// redraw cell using cache metrics information
+	void drawT(TextPainter & pain, int x, int y) const;
+	/// mark cell for re-drawing
+	void touch() const;
 
-	///
+	/// access to cached x coordinate of last drawing
 	int xo() const { return xo_; }
-	///
+	/// access to cached y coordinate of last drawing
 	int yo() const { return yo_; }
-	///
+	/// access to cached x coordinate of mid point of last drawing
+	int xm() const { return xo_ + width_ / 2; }
+	/// access to cached y coordinate of mid point of last drawing
+	int ym() const { return yo_ + (descent_ - ascent_) / 2; }
+	/// returns x coordinate of given position in the array
 	int pos2x(size_type pos) const;
-	///
+	/// returns position of given x coordinate
 	size_type x2pos(int pos) const;
 	/// returns distance of this cell to the point given by x and y
 	// assumes valid position and size cache
 	int dist(int x, int y) const;
 
-	///
+	/// ascent of this cell above the baseline
 	int ascent() const { return ascent_; }
-	///
+	/// descent of this cell below the baseline
 	int descent() const { return descent_; }
-	///
+	/// height of the cell
 	int height() const { return ascent_ + descent_; }
-	///
+	/// width of this cell
 	int width() const { return width_; }
-	/// do we cover point(x, y)?
-	bool covers(int x, int y) const;
+	/// bounding box of this cell
+	void boundingBox(int & xlow, int & xhigh, int & ylow, int & yhigh);
+	/// find best position to do things
+	//void findPos(PosFinder &) const;
+	/// gives center coordinates
+	void center(int & x, int & y) const;
+	/// adjust (x,y) to point on boundary on a straight line from the center
+	void towards(int & x, int & y) const;
 
-	///
+	/// begin iterator of the underlying MathArray
 	const_iterator begin() const { return data_.begin(); }
-	///
+	/// end iterator of the underlying MathArray
 	const_iterator end() const { return data_.end(); }
-	
+
 public:
-	///
+	/// the underlying MathArray
 	MathArray data_;
-	///
+	/// cached width of cell
 	mutable int width_;
-	///
+	/// cached ascent of cell
 	mutable int ascent_;
-	///
+	/// cached descent of cell
 	mutable int descent_;
-	///
+	/// cached x coordinate of last drawing
 	mutable int xo_;
-	///
+	/// cached y coordinate of last drawing
 	mutable int yo_;
-	///
+	/// cache size information of last drawing
 	mutable MathMetricsInfo size_;
+	/// cached cleaness of cell
+	mutable bool clean_;
+	/// cached draw status of cell
+	mutable bool drawn_;
 };
 
+/// output cell on a stream
 std::ostream & operator<<(std::ostream & os, MathXArray const & ar);
 
 #endif