Fulfill promise to Andre: TextClass_ptr --> TextClassPtr.

[lyx.git] / src / bufferview_funcs.cpp

diff --git a/src/bufferview_funcs.cpp b/src/bufferview_funcs.cpp
index 9130ec76e359408a8768401054f8322e00ef0134..4aa848d511767dadded2852865069ba6c0c3f24b 100644 (file)
--- a/src/bufferview_funcs.cpp
+++ b/src/bufferview_funcs.cpp
@@ -231,19 +231,12 @@ Point coordOffset(BufferView const & bv, DocIterator const & dit,
 Point getPos(BufferView const & bv, DocIterator const & dit, bool boundary)
 {
        CursorSlice const & bot = dit.bottom();
-       CoordCache::ParPosCache::const_iterator cache_it =
-               bv.coordCache().getParPos().find(bot.text());
-       if (cache_it == bv.coordCache().getParPos().end())
+       TextMetrics const & tm = bv.textMetrics(bot.text());
+       if (!tm.has(bot.pit()))
                return Point(-1, -1);
 
-       CoordCache::InnerParPosCache const & cache = cache_it->second;
-       CoordCache::InnerParPosCache::const_iterator it = cache.find(bot.pit());
-       if (it == cache.end()) {
-               //lyxerr << "cursor out of view" << std::endl;
-               return Point(-1, -1);
-       }
        Point p = coordOffset(bv, dit, boundary); // offset from outer paragraph
-       p.y_ += it->second.y_;
+       p.y_ += tm.parMetrics(bot.pit()).position();
        return p;
 }
 
@@ -252,15 +245,15 @@ Point getPos(BufferView const & bv, DocIterator const & dit, bool boundary)
 // FIXME: This does not work within mathed!
 CurStatus status(BufferView const * bv, DocIterator const & dit)
 {
-       CoordCache::InnerParPosCache const & cache =
-               bv->coordCache().getParPos().find(dit.bottom().text())->second;
-
-       if (cache.find(dit.bottom().pit()) != cache.end())
-               return CUR_INSIDE;
-       else if (dit.bottom().pit() < bv->anchor_ref())
+       // FIXME: it's be better to have something like TextMetrics::status().
+       TextMetrics const & tm = bv->textMetrics(dit.bottom().text());
+       int par_pos = tm.parPosition(dit.bottom().pit());
+       if (par_pos < 0)
                return CUR_ABOVE;
-       else
+       else if (par_pos > bv->workHeight())
                return CUR_BELOW;
+               
+       return CUR_INSIDE;
 }
 
 namespace {