#include <sstream>
-using lyx::Point;
-using lyx::CoordCache;
-using lyx::support::bformat;
+namespace lyx {
+
+using support::bformat;
using std::istringstream;
using std::ostringstream;
// Add contribution of initial rows of outermost paragraph
CursorSlice const & sl = dit[0];
Paragraph const & par = sl.text()->getPar(sl.pit());
+ if (par.rows().empty())
+ // FIXME: The special case below happens for empty paragraph creation
+ const_cast<LyXText *>(sl.text())->redoParagraph(const_cast<BufferView &>(bv), sl.pit());
+ BOOST_ASSERT(!par.rows().empty());
y -= par.rows()[0].ascent();
#if 1
size_t rend;
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;
+ x += dit.bottom().text()->cursorX(*bv.buffer(), 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 =
} // namespace bv_funcs
+
+
+} // namespace lyx