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

alfredo - fix height of row after DEPM

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6710 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2003-04-03 17:04:20 +00:00
parent c321843cee
commit 0b1da53fd3
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2003-04-03 Alfredo Braunstein <abraunst@libero.it>
* text2.C (dEPM): fix the heigth of the next row
2003-04-03 Alfredo Braunstein <abraunst@libero.it>
* text.C: squashed an invalid getChar requester + some ws changes

15
src/text2.C
View File

@ -2235,8 +2235,9 @@ bool LyXText::deleteEmptyParagraphMechanism(LyXCursor const & old_cursor)
deleted = true;
if (old_cursor.row() != rows().begin()) {
const_cast<LyXText *>(this)->postPaint(old_cursor.y() - old_cursor.row()->baseline()
- boost::prior(old_cursor.row())->height());
RowList::iterator
prevrow = boost::prior(old_cursor.row());
const_cast<LyXText *>(this)->postPaint(old_cursor.y() - old_cursor.row()->baseline() - prevrow->height());
tmpcursor = cursor;
cursor = old_cursor; // that undo can restore the right cursor position
Paragraph * endpar = old_cursor.par()->next();
@ -2260,13 +2261,11 @@ bool LyXText::deleteEmptyParagraphMechanism(LyXCursor const & old_cursor)
* the parindent that can occur or dissappear.
* The next row can change its height, if
* there is another layout before */
if (refresh_row != rows().end()) {
if (boost::next(refresh_row) != rows().end()) {
breakAgain(boost::next(refresh_row));
updateCounters();
}
setHeightOfRow(refresh_row);
if (boost::next(prevrow) != rows().end()) {
breakAgain(boost::next(prevrow));
updateCounters();
}
setHeightOfRow(prevrow);
} else {
RowList::iterator nextrow = boost::next(old_cursor.row());
const_cast<LyXText *>(this)->postPaint(