* src/tabular.[Ch]: simplify plaintext methods, because there

[lyx.git] / src / bufferview_funcs.C

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 508f40e2775816aa6db4d4707d32d38305dd8c91..547f94962c497187c2a68182ff851aa915e92848 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -40,10 +40,10 @@
 
 #include <sstream>
 
-using lyx::Point;
-using lyx::CoordCache;
 
-using lyx::support::bformat;
+namespace lyx {
+
+using support::bformat;
 
 using std::istringstream;
 using std::ostringstream;
@@ -176,8 +176,9 @@ Point coordOffset(BufferView const & bv, DocIterator const & dit,
 
        // Add contribution of initial rows of outermost paragraph
        CursorSlice const & sl = dit[0];
-       Paragraph const & par = sl.text()->getPar(sl.pit());
-       y -= par.rows()[0].ascent();
+       ParagraphMetrics const & pm = bv.parMetrics(sl.text(), sl.pit());
+       BOOST_ASSERT(!pm.rows().empty());
+       y -= pm.rows()[0].ascent();
 #if 1
        size_t rend;
        if (sl.pos() > 0 && dit.depth() == 1) {
@@ -185,24 +186,22 @@ Point coordOffset(BufferView const & bv, DocIterator const & dit,
                if (pos && boundary)
                        --pos;
 //             lyxerr << "coordOffset: boundary:" << boundary << " depth:" << dit.depth() << " pos:" << pos << " sl.pos:" << sl.pos() << std::endl;
-               rend = par.pos2row(pos);
+               rend = pm.pos2row(pos);
        } else
-               rend = par.pos2row(sl.pos());
+               rend = pm.pos2row(sl.pos());
 #else
-       size_t rend = par.pos2row(sl.pos());
+       size_t rend = pm.pos2row(sl.pos());
 #endif
        for (size_t rit = 0; rit != rend; ++rit)
-               y += par.rows()[rit].height();
-       y += par.rows()[rend].ascent();
-       x += dit.bottom().text()->cursorX(dit.bottom(), boundary && dit.depth() == 1);
-       // The following correction should not be there at all.
-       // The cursor looks much better with the -1, though.
-       --x;
+               y += pm.rows()[rit].height();
+       y += pm.rows()[rend].ascent();
+       x += dit.bottom().text()->cursorX(bv, dit.bottom(), boundary && dit.depth() == 1);
+
        return Point(x, y);
 }
 
 
-Point getPos(BufferView & bv, DocIterator const & dit, bool boundary)
+Point getPos(BufferView const & bv, DocIterator const & dit, bool boundary)
 {
        CursorSlice const & bot = dit.bottom();
        CoordCache::ParPosCache::const_iterator cache_it = 
@@ -223,6 +222,7 @@ Point getPos(BufferView & bv, DocIterator const & dit, bool boundary)
 
 
 // this could be used elsewhere as well?
+// FIXME: This does not work within mathed!
 CurStatus status(BufferView const * bv, DocIterator const & dit)
 {
        CoordCache::InnerParPosCache const & cache =
@@ -321,3 +321,6 @@ void gotoInset(BufferView * bv, InsetBase_code code, bool same_content)
 
 
 } // namespace bv_funcs
+
+
+} // namespace lyx