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

more small stuff

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8118 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-11-21 17:03:04 +00:00
parent 62e7385055
commit 34b73170c6
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/rowpainter.C
View File

@ -967,33 +967,25 @@ void RowPainter::paint()
}
int paintRows(BufferView const & bv, LyXText const & text,
ParagraphList::iterator pit, RowList::iterator rit,
int xo, int yo, int y)
int paintPars(BufferView const & bv, LyXText const & text,
ParagraphList::iterator pit, int xo, int yo, int y)
{
//lyxerr << " paintRows: rit: " << &*rit << endl;
//lyxerr << " paintRows: pit: " << &*pit << endl;
int const y2 = bv.painter().paperHeight();
ParagraphList::iterator end = text.ownerParagraphs().end();
bool active = false;
for ( ; pit != end; ++pit) {
RowList::iterator row = pit->rows.begin();
RowList::iterator rend = pit->rows.end();
for ( ; row != rend; ++row) {
if (row == rit)
active = true;
if (active) {
RowPainter painter(bv, text, pit, row, y + yo, xo, y + bv.top_y());
painter.paint();
y += row->height();
} else {
//lyxerr << " paintRows: row: " << &*row << " ignored" << endl;
}
RowPainter painter(bv, text, pit, row, y + yo, xo, y + bv.top_y());
painter.paint();
y += row->height();
}
if (yo + y >= y2)
return y;
break;
}
return y;
@ -1006,16 +998,14 @@ int paintText(BufferView & bv)
{
int const topy = bv.top_y();
ParagraphList::iterator pit;
RowList::iterator rit = bv.text->getRowNearY(topy, pit);
int const y = pit->y + rit->y_offset() - topy;
return paintRows(bv, *bv.text, pit, rit, 0, 0, y);
bv.text->getRowNearY(topy, pit);
return paintPars(bv, *bv.text, pit, 0, 0, pit->y - topy);
}
void paintTextInset(BufferView & bv, LyXText & text, int xo, int yo)
{
ParagraphList::iterator pit = text.ownerParagraphs().begin();
paintRows(bv, text, pit, pit->rows.begin(), xo, yo, 0);
paintPars(bv, text, text.ownerParagraphs().begin(), xo, yo, 0);
}