Revert this change as it sneaked in and wasn't discussed yet.

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

diff --git a/src/insets/inset.C b/src/insets/inset.C
index edf512538109cdd55b2161cfd79f5c46d2e37432..c6ba6bf51eaf4439e836a44e48a22da90e2fa501 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -1,8 +1,8 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *      
+ *
  *         Copyright 1995 Matthias Ettrich
  *          Copyright 1995-2001 The LyX Team.
  *
@@ -99,7 +99,7 @@ LyXFont const Inset::convertFont(LyXFont const & font) const
 #endif
 
 
-string const Inset::editMessage() const 
+string const Inset::editMessage() const
 {
        return _("Opened inset");
 }
@@ -142,7 +142,7 @@ void Inset::id(int id_arg)
        id_ = id_arg;
 }
 
-void Inset::setFont(BufferView *, LyXFont const &, bool, bool )
+void Inset::setFont(BufferView *, LyXFont const &, bool, bool)
 {}
 
 
@@ -153,6 +153,12 @@ bool Inset::forceDefaultParagraphs(Inset const * in) const
        return false;
 }
 
+int Inset::latexTextWidth(BufferView * bv) const
+{
+       if (owner())
+               return (owner()->latexTextWidth(bv));
+       return bv->workWidth();
+}
 
 // some stuff for inset locking
 
@@ -245,7 +251,7 @@ void UpdatableInset::draw(BufferView *, LyXFont const &,
 void UpdatableInset::scroll(BufferView * bv, float s) const
 {
        LyXFont font;
-       
+
        if (!s) {
                scx = 0;
                return;
@@ -253,8 +259,8 @@ void UpdatableInset::scroll(BufferView * bv, float s) const
 
        int const workW = bv->workWidth();
        int const tmp_top_x = top_x - scx;
-       
-       if (tmp_top_x > 0 && 
+
+       if (tmp_top_x > 0 &&
            (tmp_top_x + width(bv, font)) < workW)
                return;
        if (s > 0 && top_x > 0)
@@ -262,7 +268,7 @@ void UpdatableInset::scroll(BufferView * bv, float s) const
 
        // int mx_scx=abs((width(bv,font) - bv->workWidth())/2);
        //int const save_scx = scx;
-    
+
        scx = int(s * workW / 2);
        // if (!display())
        // scx += 20;
@@ -289,7 +295,7 @@ void UpdatableInset::scroll(BufferView * bv, int offset) const
                if (!scx && (top_x + width(bv, font)) < (bv->workWidth() - 20))
                        return;
                if ((top_x - scx + offset + width(bv, font)) < (bv->workWidth() - 20)) {
-                       scx = bv->workWidth() - width(bv, font) - top_x + scx - 20; 
+                       scx = bv->workWidth() - width(bv, font) - top_x + scx - 20;
                } else {
                        scx += offset;
                }
@@ -300,8 +306,8 @@ void UpdatableInset::scroll(BufferView * bv, int offset) const
 
 ///  An updatable inset could handle lyx editing commands
 UpdatableInset::RESULT
-UpdatableInset::localDispatch(BufferView * bv, 
-                             kb_action action, string const & arg) 
+UpdatableInset::localDispatch(BufferView * bv,
+                             kb_action action, string const & arg)
 {
        if (!arg.empty() && (action==LFUN_SCROLL_INSET)) {
                if (arg.find('.') != arg.npos) {
@@ -312,17 +318,17 @@ UpdatableInset::localDispatch(BufferView * bv,
                        scroll(bv, xx);
                }
                bv->updateInset(this, false);
-               
+
                return DISPATCHED;
        }
-       return UNDISPATCHED; 
+       return UNDISPATCHED;
 }
 
 
 int UpdatableInset::getMaxWidth(BufferView * bv, UpdatableInset const *) const
 {
        int w;
-       if (owner()){
+       if (owner()) {
                w = static_cast<UpdatableInset*>
                        (owner())->getMaxWidth(bv, this);
        } else {
@@ -337,16 +343,12 @@ int UpdatableInset::getMaxWidth(BufferView * bv, UpdatableInset const *) const
        if (topx_set && owner()) {
                w -= top_x;
                w += owner()->x();
-       }
-#if 0 // already handled above now!!!
-       else if (!owner()) {
-               // give some left margin this should be made better!
-               // Idea: LyXText::giveLeftMargin(Inset * inset) will search the
-               //       inset in the text and return the LeftMargin of that row!
-               lyxerr << "w -= 20\n";
+       } 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
                w -= 20;
        }
-#endif
        if (w < 10) {
                w = 10;
        }
@@ -373,7 +375,7 @@ string const UpdatableInset::selectNextWordToSpellcheck(BufferView *bv,
 
 
 bool UpdatableInset::searchForward(BufferView * bv, string const &,
-                                   bool, bool)
+                                  bool, bool)
 {
        // we have to unlock ourself in this function by default!
        bv->unlockInset(const_cast<UpdatableInset *>(this));
@@ -382,7 +384,7 @@ bool UpdatableInset::searchForward(BufferView * bv, string const &,
 
 
 bool UpdatableInset::searchBackward(BufferView * bv, string const &,
-                                    bool, bool)
+                                   bool, bool)
 {
        // we have to unlock ourself in this function by default!
        bv->unlockInset(const_cast<UpdatableInset *>(this));