The markDirty() and fitCursor() changes

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

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index ab92203805e0036e746a1e652eb3ec46b362f9bc..9261c351cd88125dced98a63822137158d001c0d 100644 (file)
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -355,7 +355,7 @@ int InsetERT::latex(Buffer const *, ostream & os, bool /*fragile*/,
                        // ignore all struck out text
                        if (isDeletedText(*par, i))
                                continue;
- 
+
                        if (par->isNewline(i)) {
                                os << '\n';
                                ++lines;
@@ -445,11 +445,11 @@ Inset::RESULT InsetERT::localDispatch(FuncRequest const & cmd)
                InsetERTMailer::string2params(cmd.argument, status_);
 
                status(bv, status_);
-               bv->updateInset(this, true);
+               bv->updateInset(this);
                result = DISPATCHED;
        }
        break;
-               
+
        case LFUN_MOUSE_PRESS:
                lfunMousePress(cmd);
                result = DISPATCHED;
@@ -567,7 +567,7 @@ int InsetERT::width(BufferView * bv, LyXFont const & font) const
 
 
 void InsetERT::draw(BufferView * bv, LyXFont const & f,
-                   int baseline, float & x, bool cleared) const
+                   int baseline, float & x) const
 {
        lyx::Assert(bv);
        cache(bv);
@@ -589,18 +589,6 @@ void InsetERT::draw(BufferView * bv, LyXFont const & f,
        if (!owner())
                x += static_cast<float>(scroll());
 
-       if (!cleared && (inset.need_update == InsetText::FULL ||
-                        inset.need_update == InsetText::INIT ||
-                        top_x != int(x) ||
-                        top_baseline != baseline))
-       {
-               // we don't need anymore to clear here we just have to tell
-               // the underlying LyXText that it should do the RowClear!
-               inset.setUpdateStatus(bv, InsetText::FULL);
-               bv->text->status(bv, LyXText::CHANGED_IN_DRAW);
-               return;
-       }
-
        top_x = int(x);
        topx_set = true;
        top_baseline = baseline;
@@ -608,12 +596,10 @@ void InsetERT::draw(BufferView * bv, LyXFont const & f,
        int const bl = baseline - ascent(bv, f) + ascent_collapsed();
 
        if (inlined()) {
-               inset.draw(bv, f, baseline, x, cleared);
+               inset.draw(bv, f, baseline, x);
        } else {
                draw_collapsed(pain, bl, old_x);
-               inset.draw(bv, f,
-                                  bl + descent_collapsed() + inset.ascent(bv, f),
-                                  x, cleared);
+               inset.draw(bv, f, bl + descent_collapsed() + inset.ascent(bv, f), x);
        }
        need_update = NONE;
 }
@@ -654,8 +640,10 @@ void InsetERT::status(BufferView * bv, ERTStatus const st) const
                                bv->unlockInset(const_cast<InsetERT *>(this));
                        break;
                }
-               if (bv)
-                       bv->updateInset(const_cast<InsetERT *>(this), false);
+               if (bv) {
+                       bv->updateInset(const_cast<InsetERT *>(this));
+                       bv->buffer()->markDirty();
+               }
        }
 }