* \author Jean-Marc Lasgouttes
* \author John Levon
* \author Angus Leeming
+ * \author Juergen Vigna
*
* Full author contact details are available in file CREDITS.
*/
// the next two should probably go elsewhere
// this give the position relative to (0, baseline) of outermost
// paragraph
-Point coordOffset(DocIterator const & dit)
+Point coordOffset(DocIterator const & dit, bool boundary)
{
int x = 0;
int y = 0;
CursorSlice const & sl = dit[i];
int xx = 0;
int yy = 0;
- sl.inset().getCursorPos(sl, xx, yy);
+ sl.inset().cursorPos(sl, boundary && ((i+1) == dit.depth()), xx, yy);
x += xx;
y += yy;
- //lyxerr << "LCursor::getPos, i: " << i << " x: " << xx << " y: " << y << endl;
+ //lyxerr << "LCursor::getPos, i: "
+ // << i << " x: " << xx << " y: " << y << endl;
}
// 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();
- for (size_t rit = 0, rend = par.pos2row(sl.pos()); rit != rend; ++rit)
+#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 = par.pos2row(pos);
+ } else
+ rend = par.pos2row(sl.pos());
+#else
+ size_t rend = par.pos2row(sl.pos());
+#endif
+ for (size_t rit = 0; rit != rend; ++rit)
y += par.rows()[rit].height();
- y += par.rows()[par.pos2row(sl.pos())].ascent();
- x += dit.bottom().text()->cursorX(dit.bottom());
+ 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 cusor looks much better with the -1, though.
+ // The cursor looks much better with the -1, though.
--x;
return Point(x, y);
}
-Point getPos(DocIterator const & dit)
+Point getPos(DocIterator const & dit, bool boundary)
{
CursorSlice const & bot = dit.bottom();
- CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(bot.text())->second;
+ CoordCache::InnerParPosCache const & cache =
+ theCoords.getParPos().find(bot.text())->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(dit); // offset from outer paragraph
+ Point p = coordOffset(dit, boundary); // offset from outer paragraph
p.y_ += it->second.y_;
return p;
}