anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-27 03:36:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/cursor.C

Browse Source 
(bruteFind): only iterate over the paragraphs that are
	in the CoordCache (bug 2217)



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13476 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2006-03-24 13:09:46 +00:00
parent 05ea233390
commit e7141d6b86
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cursor.C
View File

@ -127,16 +127,26 @@ namespace {
BOOST_ASSERT(!cursor.empty()); BOOST_ASSERT(!cursor.empty());
InsetBase & inset = cursor[0].inset(); InsetBase & inset = cursor[0].inset();
DocIterator it = doc_iterator_begin(inset); CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(cursor.bottom().text())->second;
DocIterator const et = doc_iterator_end(inset); // Get an iterator on the first paragraph in the cache
DocIterator it(inset);
it.push_back(CursorSlice(inset));
it.pit() = cache.begin()->first;
// Get an iterator after the last paragraph in the cache
DocIterator et(inset);
et.push_back(CursorSlice(inset));
et.pit() = boost::prior(cache.end())->first;
if (et.pit() >= et.lastpit())
et = doc_iterator_end(inset);
else
++et.pit();
double best_dist = std::numeric_limits<double>::max();; double best_dist = std::numeric_limits<double>::max();;
DocIterator best_cursor = et; DocIterator best_cursor = et;
for ( ; it != et; it.forwardPos(true)) { for ( ; it != et; it.forwardPos(true)) {
// avoid invalid nesting when selecting // avoid invalid nesting when selecting
if (bv_funcs::status(&cursor.bv(), it) == bv_funcs::CUR_INSIDE if (!cursor.selection() || positionable(it, cursor.anchor_)) {
&& (!cursor.selection() || positionable(it, cursor.anchor_))) {
Point p = bv_funcs::getPos(it, false); Point p = bv_funcs::getPos(it, false);
int xo = p.x_; int xo = p.x_;
int yo = p.y_; int yo = p.y_;
@ -147,7 +157,7 @@ namespace {
// '<=' in order to take the last possible position // '<=' in order to take the last possible position
// this is important for clicking behind \sum in e.g. '\sum_i a' // this is important for clicking behind \sum in e.g. '\sum_i a'
if (d <= best_dist) { if (d <= best_dist) {
lyxerr << "*" << endl; // lyxerr << "*" << endl;
best_dist = d; best_dist = d;
best_cursor = it; best_cursor = it;
} }