More fixes to the autocollapsing of paragraphs.

[lyx.git] / src / screen.C

diff --git a/src/screen.C b/src/screen.C
index ba1dc7dec4b6a537f86fd216343e1e3a730da336..561ac127b6d5f271028e3deb0794ce5fbee833f8 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -129,7 +129,7 @@ void LyXScreen::drawFromTo(LyXText * text, BufferView * bv,
                text->getVisibleRow(bv, y + y_offset,
                                    x_offset, row, y + text->first);
                internal = internal && (st != LyXText::CHANGED_IN_DRAW);
-               while(internal && text->status() == LyXText::CHANGED_IN_DRAW) {
+               while (internal && text->status() == LyXText::CHANGED_IN_DRAW) {
                        if (text->fullRebreak(bv)) {
                                st = LyXText::NEED_MORE_REFRESH;
                                text->setCursor(bv, text->cursor.par(), text->cursor.pos());
@@ -393,21 +393,25 @@ unsigned int LyXScreen::topCursorVisible(LyXText const * text)
            + text->cursor.row()->height()
            - text->first >= owner.height()) {
                if (text->cursor.row()->height() < owner.height()
-                   && text->cursor.row()->height() > owner.height() / 4)
+                   && text->cursor.row()->height() > owner.height() / 4) {
                        newtop = text->cursor.y()
                                + text->cursor.row()->height()
                                - text->cursor.row()->baseline() - owner.height();
-               else
+               } else {
+                       // scroll down
                        newtop = text->cursor.y()
-                               - 3 * owner.height() / 4;   /* the scroll region must be so big!! */
+                               - owner.height() / 2;   /* the scroll region must be so big!! */
+               }
+               
        } else if (static_cast<int>((text->cursor.y()) - text->cursor.row()->baseline()) <
                   text->first && text->first > 0)
        {
                if (text->cursor.row()->height() < owner.height()
-                   && text->cursor.row()->height() > owner.height() / 4)
+                   && text->cursor.row()->height() > owner.height() / 4) {
                        newtop = text->cursor.y() - text->cursor.row()->baseline();
-               else {
-                       newtop = text->cursor.y() - owner.height() / 4;
+               } else {
+                       // scroll up
+                       newtop = text->cursor.y() - owner.height() / 2;
                        newtop = min(newtop, int(text->first));
                }
        }
@@ -432,7 +436,7 @@ bool LyXScreen::fitCursor(LyXText * text, BufferView * bv)
 
    
 void LyXScreen::update(LyXText * text, BufferView * bv,
-                      int y_offset, int x_offset)
+                       int y_offset, int x_offset)
 {
        switch (text->status()) {
        case LyXText::NEED_MORE_REFRESH:
@@ -440,7 +444,10 @@ void LyXScreen::update(LyXText * text, BufferView * bv,
                int const y = max(int(text->refresh_y - text->first), 0);
                drawFromTo(text, bv, y, owner.height(), y_offset, x_offset);
                text->refresh_y = 0;
-               text->status(bv, LyXText::UNCHANGED);
+               // otherwise this is called ONLY from BufferView_pimpl(update)
+               // or we should see to set this flag accordingly
+               if (text != bv->text)
+                       text->status(bv, LyXText::UNCHANGED);
                expose(0, y, owner.workWidth(), owner.height() - y);
        }
        break;
@@ -452,7 +459,10 @@ void LyXScreen::update(LyXText * text, BufferView * bv,
                // this because if we had a major update the refresh_row could
                // have been set to 0!
                if (text->refresh_row) {
-                       text->status(bv, LyXText::UNCHANGED);
+                       // otherwise this is called ONLY from BufferView_pimpl(update)
+                       // or we should see to set this flag accordingly
+                       if (text != bv->text)
+                               text->status(bv, LyXText::UNCHANGED);
                        expose(0, text->refresh_y - text->first + y_offset,
                                   owner.workWidth(), text->refresh_row->height());
                }