fix #832

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

diff --git a/src/insets/updatableinset.C b/src/insets/updatableinset.C
index fa31bad229e01b9e9fcac85187e2f0e0ebdf5bcf..eb61360c69a585d1dcb5cbc15b5ecb5e268861e7 100644 (file)
--- a/src/insets/updatableinset.C
+++ b/src/insets/updatableinset.C
@@ -26,12 +26,12 @@
 // some stuff for inset locking
 
 UpdatableInset::UpdatableInset()
-       : Inset(), cursor_visible_(false), block_drawing_(false)
+       : Inset(), block_drawing_(false)
 {}
 
 
 UpdatableInset::UpdatableInset(UpdatableInset const & in, bool same_id)
-       : Inset(in, same_id), cursor_visible_(false), block_drawing_(false)
+       : Inset(in, same_id), block_drawing_(false)
 {}
 
 
@@ -48,33 +48,12 @@ Inset::EDITABLE UpdatableInset::editable() const
 }
 
 
-void UpdatableInset::toggleInsetCursor(BufferView *)
-{}
-
-
-void UpdatableInset::showInsetCursor(BufferView *, bool)
-{}
-
-
-void UpdatableInset::hideInsetCursor(BufferView *)
-{}
-
-
 void UpdatableInset::fitInsetCursor(BufferView *) const
 {}
 
 
-void UpdatableInset::edit(BufferView *, int, int, mouse_button::state)
-{}
-
-
-void UpdatableInset::edit(BufferView *, bool)
-{}
-
-
 void UpdatableInset::draw(BufferView *, LyXFont const &,
-                         int /* baseline */, float & x,
-                         bool/*cleared*/) const
+                         int /* baseline */, float & x) const
 {
        x += float(scx);
        // ATTENTION: don't do the following here!!!
@@ -111,8 +90,6 @@ void UpdatableInset::scroll(BufferView * bv, float s) const
        if ((tmp_top_x + scx + width(bv, font)) < (workW / 2)) {
                scx += (workW / 2) - (tmp_top_x + scx + width(bv, font));
        }
-
-       // bv->updateInset(const_cast<UpdatableInset *>(this), false);
 }
 
 void UpdatableInset::scroll(BufferView * bv, int offset) const
@@ -135,7 +112,6 @@ void UpdatableInset::scroll(BufferView * bv, int offset) const
                        scx += offset;
                }
        }
-//     bv->updateInset(const_cast<UpdatableInset *>(this), false);
 }
 
 
@@ -153,7 +129,7 @@ Inset::RESULT UpdatableInset::localDispatch(FuncRequest const & ev)
                        int const xx = strToInt(ev.argument);
                        scroll(ev.view(), xx);
                }
-               ev.view()->updateInset(this, false);
+               ev.view()->updateInset(this);
 
                return DISPATCHED;
        }
@@ -164,11 +140,11 @@ Inset::RESULT UpdatableInset::localDispatch(FuncRequest const & ev)
 int UpdatableInset::getMaxWidth(BufferView * bv, UpdatableInset const *) const
 {
        int w;
+
        if (owner()) {
-               w = static_cast<UpdatableInset*>
-                       (owner())->getMaxWidth(bv, this);
+               w = static_cast<UpdatableInset*> (owner())->getMaxWidth(bv, this);
        } else {
-               w = bv->text->workWidth(bv, const_cast<UpdatableInset *>(this));
+               w = bv->text->workWidth(const_cast<UpdatableInset *>(this));
        }
        if (w < 0) {
                return -1;
@@ -176,15 +152,14 @@ int UpdatableInset::getMaxWidth(BufferView * bv, UpdatableInset const *) const
        // check for margins left/right and extra right margin "const 5"
        if ((w - ((2 * TEXT_TO_INSET_OFFSET) + 5)) >= 0)
                w -= (2 * TEXT_TO_INSET_OFFSET) + 5;
-       if (topx_set && owner()) {
-               w -= top_x;
-               w += owner()->x();
-       } else if (owner()) {
-               // this is needed as otherwise we might have a too large inset if
-               // its top_x afterwards changes to LeftMargin so we try to put at
-               // least the default margin as top_x
+
+       // Deep magic. I don't understand this either.
+       if (owner() && owner()->owner()) {
+               // add the right paper margin
                w -= 20;
        }
+
+       // FIXME: why ?
        if (w < 10) {
                w = 10;
        }
@@ -217,7 +192,7 @@ bool UpdatableInset::nextChange(BufferView * bv, lyx::pos_type &)
        return false;
 }
 
- 
+
 bool UpdatableInset::searchForward(BufferView * bv, string const &,
                                   bool, bool)
 {