X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FCoordCache.h;h=9871819c10aa1d1a961c7c01b094b7778572fc7d;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=f670bba48e596edc1c4413f72590a907e0d6605d;hpb=430a18042e400945cbabdbcb4b51137cf0687df2;p=lyx.git

diff --git a/src/CoordCache.h b/src/CoordCache.h
index f670bba48e..9871819c10 100644
--- a/src/CoordCache.h
+++ b/src/CoordCache.h
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -16,8 +16,6 @@
 
 #include "Dimension.h"
 
-#include "support/types.h"
-
 #include <map>
 
 namespace lyx {
@@ -29,18 +27,6 @@ class Paragraph;
 
 void lyxbreaker(void const * data, const char * hint, int size);
 
-class Point {
-public:
-	Point()
-		: x_(0), y_(0)
-	{}
-
-	Point(int x, int y);
-
-	int x_, y_;
-};
-
-
 struct Geometry {
 	Point pos;
 	Dimension dim;
@@ -93,6 +79,8 @@ public:
 
 	void add(T const * thing, Dimension const & dim)
 	{
+		if (!has(thing))
+			data_[thing].pos = Point(-10000, -10000);
 		data_[thing].dim = dim;
 	}
 
@@ -104,7 +92,7 @@ public:
 
 	Dimension const & dim(T const * thing) const
 	{
-		check(thing, "dim");
+		checkDim(thing, "dim");
 		return data_.find(thing)->second.dim;
 	}
 
@@ -127,6 +115,15 @@ public:
 	}
 
 	bool has(T const * thing) const
+	{
+		typename cache_type::const_iterator it = data_.find(thing);
+
+		if (it == data_.end())
+			return false;
+		return it->second.pos.x_ != -10000;
+	}
+
+	bool hasDim(T const * thing) const
 	{
 		return data_.find(thing) != data_.end();
 	}
@@ -139,7 +136,7 @@ public:
 
 	int squareDistance(T const * thing, int x, int y) const
 	{
-		cache_type::const_iterator it = data_.find(thing);
+		typename cache_type::const_iterator it = data_.find(thing);
 		if (it == data_.end())
 			return 1000000;
 		return it->second.squareDistance(x, y);
@@ -148,6 +145,12 @@ public:
 private:
 	friend class CoordCache;
 
+	void checkDim(T const * thing, char const * hint) const
+	{
+		if (!hasDim(thing))
+			lyxbreaker(thing, hint, data_.size());
+	}
+
 	void check(T const * thing, char const * hint) const
 	{
 		if (!has(thing))
@@ -156,9 +159,6 @@ private:
 
 	typedef std::map<T const *, Geometry> cache_type;
 	cache_type data_;
-
-public:
-	cache_type const & getData() const { return data_; }
 };
 
 /**
@@ -167,10 +167,10 @@ public:
  * All points cached in this cache are only valid between subsequent
  * updates. (x,y) == (0,0) is the upper left screen corner, x increases
  * to the right, y increases downwords.
- * The dimension part is built in BufferView::updateMetrics() and the 
+ * The dimension part is built in BufferView::updateMetrics() and the
  * diverse Inset::metrics() calls.
  * The individual points are added at drawing time in
- * BufferView::updateMetrics(). The math inset position are cached in
+ * BufferView::draw(). The math inset position are cached in
  * the diverse InsetMathXXX::draw() calls and the in-text inset position
  * are cached in RowPainter::paintInset().
  * FIXME: For mathed, it would be nice if the insets did not saves their
@@ -182,19 +182,21 @@ public:
 	void clear();
 
 	/// A map from MathData to position on the screen
-	CoordCacheBase<MathData> & arrays() { return arrays_; }
-	CoordCacheBase<MathData> const & getArrays() const { return arrays_; }
+	typedef CoordCacheBase<MathData> Arrays;
+	Arrays & arrays() { return arrays_; }
+	Arrays const & getArrays() const { return arrays_; }
 	/// A map from insets to positions on the screen
-	CoordCacheBase<Inset> & insets() { return insets_; }
-	CoordCacheBase<Inset> const & getInsets() const { return insets_; }
+	typedef CoordCacheBase<Inset> Insets;
+	Insets & insets() { return insets_; }
+	Insets const & getInsets() const { return insets_; }
 
 	/// Dump the contents of the cache to lyxerr in debugging form
 	void dump() const;
 private:
 	/// MathDatas
-	CoordCacheBase<MathData> arrays_;
+	Arrays arrays_;
 	// All insets
-	CoordCacheBase<Inset> insets_;
+	Insets insets_;
 };
 
 } // namespace lyx