John's Layout Tabular UI improvements and Martins fixes to clearing the

[lyx.git] / src / screen.C

diff --git a/src/screen.C b/src/screen.C
index 561ac127b6d5f271028e3deb0794ce5fbee833f8..616b0916e4cd70ed6b560cef1b019e3ba0b30707 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -388,27 +388,30 @@ unsigned int LyXScreen::topCursorVisible(LyXText const * text)
 {
        int newtop = text->first;
 
-       if (text->cursor.y()
-           - text->cursor.row()->baseline()
-           + text->cursor.row()->height()
+       Row * row = text->cursor.row();
+
+       // Is this a hack? Yes, probably... (Lgb)
+       if (!row)
+               return max(newtop, 0);
+       
+       if (text->cursor.y() - row->baseline() + row->height()
            - text->first >= owner.height()) {
-               if (text->cursor.row()->height() < owner.height()
-                   && text->cursor.row()->height() > owner.height() / 4) {
+               if (row->height() < owner.height()
+                   && row->height() > owner.height() / 4) {
                        newtop = text->cursor.y()
-                               + text->cursor.row()->height()
-                               - text->cursor.row()->baseline() - owner.height();
+                               + row->height()
+                               - row->baseline() - owner.height();
                } else {
                        // scroll down
                        newtop = text->cursor.y()
                                - 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) {
-                       newtop = text->cursor.y() - text->cursor.row()->baseline();
+       } else if (static_cast<int>((text->cursor.y()) - row->baseline()) <
+                  text->first && text->first > 0) {
+               if (row->height() < owner.height()
+                   && row->height() > owner.height() / 4) {
+                       newtop = text->cursor.y() - row->baseline();
                } else {
                        // scroll up
                        newtop = text->cursor.y() - owner.height() / 2;