bool isInside(DocIterator const & it, MathArray const & ar,
lyx::pos_type p1, lyx::pos_type p2)
{
- for (size_t i = 0; i != it.size(); ++i) {
+ for (size_t i = 0; i != it.depth(); ++i) {
CursorSlice const & sl = it[i];
if (sl.inset().inMathed() && &sl.cell() == &ar)
return p1 <= sl.pos() && sl.pos() < p2;
}
}
#endif
+ theCoords.insets().add(at.nucleus(), x, y);
at->drawSelection(pi, x, y);
at->draw(pi, x, y);
x += at->width();
const_iterator it = begin();
int lastx = 0;
int currx = 0;
+ // find first position after targetx
for (; currx < targetx && it < end(); ++it) {
lastx = currx;
if ((*it)->getChar() == ' ')
currx += glue;
currx += (*it)->width();
}
- if (abs(lastx - targetx) < abs(currx - targetx) && it != begin())
+
+ /**
+ * If we are not at the beginning of the array, go to the left
+ * of the inset if one of the following two condition holds:
+ * - the current inset is editable (so that the cursor tip is
+ * deeper than us): in this case, we want all intermediate
+ * cursor slices to be before insets;
+ * - the mouse is closer to the left side of the inset than to
+ * the right one.
+ * See bug 1918 for details.
+ **/
+ if (it != begin()
+ && ((*boost::prior(it))->asNestInset()
+ || abs(lastx - targetx) < abs(currx - targetx))) {
--it;
+ }
+
return it - begin();
}
void MathArray::setXY(int x, int y) const
{
//lyxerr << "setting position cache for MathArray " << this << std::endl;
- theCoords.arrays_.add(this, x, y);
+ theCoords.arrays().add(this, x, y);
}
int MathArray::xo() const
{
- return theCoords.arrays_.x(this);
+ return theCoords.getArrays().x(this);
}
int MathArray::yo() const
{
- return theCoords.arrays_.y(this);
+ return theCoords.getArrays().y(this);
}