- Paragraph const & par = sl.text()->getPar(sl.pit());
- y -= par.rows()[0].ascent();
- for (size_t rit = 0, rend = par.pos2row(sl.pos()); rit != rend; ++rit)
- y += par.rows()[rit].height();
- y += par.rows()[par.pos2row(sl.pos())].ascent();
- x += dit.bottom().text()->cursorX(dit.bottom());
- // The following correction should not be there at all.
- // The cusor looks much better with the -1, though.
- --x;
+ 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) {
+ int pos = sl.pos();
+ if (pos && boundary)
+ --pos;
+// lyxerr << "coordOffset: boundary:" << boundary << " depth:" << dit.depth() << " pos:" << pos << " sl.pos:" << sl.pos() << std::endl;
+ rend = pm.pos2row(pos);
+ } else
+ rend = pm.pos2row(sl.pos());
+#else
+ size_t rend = pm.pos2row(sl.pos());
+#endif
+ for (size_t rit = 0; rit != rend; ++rit)
+ y += pm.rows()[rit].height();
+ y += pm.rows()[rend].ascent();
+ x += dit.bottom().text()->cursorX(bv, dit.bottom(), boundary && dit.depth() == 1);
+