tiny simplification

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8115 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-11-21 15:52:11 +00:00
parent a976dd9104
commit 7e4b605961
2 changed files with 11 additions and 6 deletions

View File

@ -1,3 +1,8 @@
2003-11-21 André Pönitz <poenitz@gmx.net>
* rowpainter.C: simplification
2003-11-21 Alfredo Braunstein <abraunst@lyx.org> 2003-11-21 Alfredo Braunstein <abraunst@lyx.org>
* text3.C (dispatch): make possible to extend a word/row selection * text3.C (dispatch): make possible to extend a word/row selection

View File

@ -973,10 +973,10 @@ void RowPainter::paint()
int paintRows(BufferView const & bv, LyXText const & text, int paintRows(BufferView const & bv, LyXText const & text,
ParagraphList::iterator pit, RowList::iterator rit, ParagraphList::iterator pit, RowList::iterator rit,
int xo, int y, int yf, int yo) int xo, int yo, int y)
{ {
//lyxerr << " paintRows: rit: " << &*rit << endl; //lyxerr << " paintRows: rit: " << &*rit << endl;
int const yy = yf - y; int const yy = yo;
int const y2 = bv.painter().paperHeight(); int const y2 = bv.painter().paperHeight();
ParagraphList::iterator end = text.ownerParagraphs().end(); ParagraphList::iterator end = text.ownerParagraphs().end();
@ -1013,11 +1013,11 @@ int paintText(BufferView & bv)
ParagraphList::iterator pit; ParagraphList::iterator pit;
RowList::iterator rit = bv.text->getRowNearY(topy, pit); RowList::iterator rit = bv.text->getRowNearY(topy, pit);
int const y = pit->y + rit->y_offset() - topy; int const y = pit->y + rit->y_offset() - topy;
return paintRows(bv, *bv.text, pit, rit, 0, y, y, 0); return paintRows(bv, *bv.text, pit, rit, 0, 0, y);
} }
void paintTextInset(BufferView & bv, LyXText & text, int x, int baseline) void paintTextInset(BufferView & bv, LyXText & text, int xo, int baseline)
{ {
RowList::iterator rit = text.firstRow(); RowList::iterator rit = text.firstRow();
RowList::iterator end = text.endRow(); RowList::iterator end = text.endRow();
@ -1030,9 +1030,9 @@ void paintTextInset(BufferView & bv, LyXText & text, int x, int baseline)
text.nextRow(pit, rit); text.nextRow(pit, rit);
} }
if (y_offset < 0) if (y_offset < 0)
paintRows(bv, text, pit, rit, x, 0, y, y); paintRows(bv, text, pit, rit, xo, y, 0);
else else
paintRows(bv, text, pit, rit, x, 0, y_offset, y_offset); paintRows(bv, text, pit, rit, xo, y_offset, 0);
} }