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

Alfredo's getRowNearY patch

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7564 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-08-18 08:35:25 +00:00
parent 7000451e00
commit 017649d4a5
1 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/text.C
View File

@ -2152,34 +2152,18 @@ RowList::iterator LyXText::cursorIRow() const
RowList::iterator LyXText::getRowNearY(int & y,
ParagraphList::iterator & pit) const
{
ParagraphList::iterator const end = ownerParagraphs().end();
//lyxerr << "getRowNearY: y " << y << endl;
for (pit = ownerParagraphs().begin(); pit != end; ++pit) {
RowList::iterator rit = pit->rows.begin();
RowList::iterator rend = pit->rows.end();
for ( ; rit != rend; ++rit) {
//rit->dump();
if (rit->y() >= y) {
if (rit != firstRow())
previousRow(pit, rit);
y = rit->y();
return rit;
}
}
}
#if 1
pit = ownerParagraphs().begin();
y = 0;
lyxerr << "row not found near " << y << " pit: " << &*pit << endl;
return firstRow();
#else
pit = boost::prior(ownerParagraphs().end());
lyxerr << "row not found near " << y << " pit: " << &*pit << endl;
return lastRow();
#endif
RowList::iterator rit = firstRow();
RowList::iterator rend = endRow();
for (; rit != rend; nextRow(pit, rit))
if (rit->y() > y)
break;
previousRow(pit, rit);
y = rit->y();
return rit;
}
@ -2210,12 +2194,11 @@ RowList::iterator LyXText::endRow() const
void LyXText::nextRow(ParagraphList::iterator & pit,
RowList::iterator & rit) const
{
if (boost::next(rit) != pit->rows.end()) {
rit = boost::next(rit);
} else {
++rit;
if (rit == pit->rows.end()) {
++pit;
if (pit == ownerParagraphs().end())
rit = boost::next(rit);
--pit;
else
rit = pit->rows.begin();
}
@ -2226,7 +2209,7 @@ void LyXText::previousRow(ParagraphList::iterator & pit,
RowList::iterator & rit) const
{
if (rit != pit->rows.begin())
rit = boost::prior(rit);
--rit;
else {
Assert(pit != ownerParagraphs().begin());
--pit;