prepare for 1.1.6pre2

[lyx.git] / src / insets / inset.C

diff --git a/src/insets/inset.C b/src/insets/inset.C
index aa1fadca8141c6de87c82d18c989273161aaad1b..c5526aa723fd0b909c94bad24e276512901be91d 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -167,6 +167,10 @@ void UpdatableInset::scroll(BufferView * bv, float s) const
 {
     LyXFont font;
 
+    if (!s) {
+       scx = 0;
+       return;
+    }
     if (((top_x - scx) > 0) && 
        (top_x - scx + width(bv, font)) < bv->workWidth())
        return;
@@ -189,7 +193,7 @@ void UpdatableInset::scroll(BufferView * bv, float s) const
 void UpdatableInset::scroll(BufferView * bv, int offset) const
 {
     if (offset > 0) {
-       if (!scx && top_x > 0)
+       if (!scx && top_x >= 20)
            return;
        if ((top_x + offset) > 20)
            scx += offset - (top_x - scx + offset - 20);