Small fixes to various InsetText problems.

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

diff --git a/src/insets/inset.C b/src/insets/inset.C
index f473f151f448c9b1e213dd227af4901dc9c0ec2d..90c7d74e2dbbe96c2904041858b0fa47ed6e89b3 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -34,14 +34,14 @@ using std::endl;
 unsigned int Inset::inset_id = 0;
 
 Inset::Inset()
-       : top_x(0), top_baseline(0), scx(0), id_(inset_id++), owner_(0),
-         background_color_(LColor::inherit)
+       : top_x(0), topx_set(false), top_baseline(0), scx(0),
+         id_(inset_id++), owner_(0), background_color_(LColor::inherit)
 {}
 
 
 Inset::Inset(Inset const & in, bool same_id)
-       : top_x(0), top_baseline(0), scx(0), owner_(0), name(in.name),
-         background_color_(in.background_color_)
+       : top_x(0), topx_set(false), top_baseline(0), scx(0), owner_(0),
+         name_(in.name_), background_color_(in.background_color_)
 {
        if (same_id)
                id_ = in.id();
@@ -86,10 +86,16 @@ void Inset::edit(BufferView *, bool)
 {}
 
 
+#if 0
 LyXFont const Inset::convertFont(LyXFont const & font) const
 {
+#if 1
+       return font;
+#else
        return LyXFont(font);
+#endif
 }
+#endif
 
 
 string const Inset::editMessage() const 
@@ -135,6 +141,9 @@ void Inset::id(int id_arg)
        id_ = id_arg;
 }
 
+void Inset::setFont(BufferView *, LyXFont const &, bool, bool )
+{}
+
 // some stuff for inset locking
 
 UpdatableInset::UpdatableInset()
@@ -222,10 +231,6 @@ void UpdatableInset::draw(BufferView *, LyXFont const &,
 }
 
 
-void UpdatableInset::setFont(BufferView *, LyXFont const &, bool, bool )
-{}
-
-
 void UpdatableInset::scroll(BufferView * bv, float s) const
 {
        LyXFont font;
@@ -305,18 +310,47 @@ UpdatableInset::localDispatch(BufferView * bv,
 
 int UpdatableInset::getMaxWidth(BufferView * bv, UpdatableInset const *) const
 {
-       if (owner())
-               return static_cast<UpdatableInset*>
+       int w;
+       if (owner()){
+               w = static_cast<UpdatableInset*>
                        (owner())->getMaxWidth(bv, this);
-       return bv->workWidth();
+       } else {
+               w = bv->text->workWidth(bv, const_cast<UpdatableInset *>(this));
+       }
+       if (w < 0) {
+               return -1;
+       }
+       // 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();
+       }
+#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";
+               w -= 20;
+       }
+#endif
+       if (w < 10) {
+               w = 10;
+       }
+       return w;
 }
 
+
 LyXCursor const & Inset::cursor(BufferView * bv) const
 {
        return bv->text->cursor;
 }
 
-string UpdatableInset::selectNextWord(BufferView *bv, float & value) const
+
+string const UpdatableInset::selectNextWordToSpellcheck(BufferView *bv,
+                                           float & value) const
 {
        // we have to unlock ourself in this function by default!
        bv->unlockInset(const_cast<UpdatableInset *>(this));
@@ -324,6 +358,7 @@ string UpdatableInset::selectNextWord(BufferView *bv, float & value) const
        return string();
 }
 
+
 bool UpdatableInset::searchForward(BufferView * bv, string const &,
                                    bool const &, bool const &)
 {
@@ -332,6 +367,7 @@ bool UpdatableInset::searchForward(BufferView * bv, string const &,
        return false;
 }
 
+
 bool UpdatableInset::searchBackward(BufferView * bv, string const &,
                                     bool const &, bool const &)
 {