Don't remove cell selections after fontchange.

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

diff --git a/src/insets/inset.C b/src/insets/inset.C
index 483d9bea1e369ab67c74f5ff8a4a4b22b92ee826..c8eba90eb3bfe80dd10e5e93b8149439b69f5a1c 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -35,7 +35,8 @@ unsigned int Inset::inset_id = 0;
 
 Inset::Inset()
        : top_x(0), topx_set(false), top_baseline(0), scx(0),
-         id_(inset_id++), owner_(0), background_color_(LColor::inherit)
+         id_(inset_id++), owner_(0), par_owner_(0),
+         background_color_(LColor::inherit)
 {}
 
 
@@ -141,9 +142,24 @@ 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)
 {}
 
+
+bool Inset::forceDefaultParagraphs(Inset const * in) const
+{
+       if (owner())
+               return owner()->forceDefaultParagraphs(in);
+       return false;
+}
+
+int Inset::latexTextWidth(BufferView * bv) const
+{
+       if (owner())
+               return (owner()->latexTextWidth(bv));
+       return bv->workWidth();
+}
+
 // some stuff for inset locking
 
 UpdatableInset::UpdatableInset()
@@ -163,10 +179,11 @@ void UpdatableInset::insetButtonPress(BufferView *, int x, int y, int button)
 }
 
 
-void UpdatableInset::insetButtonRelease(BufferView *, int x, int y, int button)
+bool UpdatableInset::insetButtonRelease(BufferView *, int x, int y, int button)
 {
        lyxerr[Debug::INFO] << "Inset Button Release x=" << x
                       << ", y=" << y << ", button=" << button << endl;
+       return false;
 }
 
 
@@ -311,11 +328,11 @@ UpdatableInset::localDispatch(BufferView * bv,
 int UpdatableInset::getMaxWidth(BufferView * bv, UpdatableInset const *) const
 {
        int w;
-       if (owner()){
+       if (owner()) {
                w = static_cast<UpdatableInset*>
                        (owner())->getMaxWidth(bv, this);
        } else {
-               w = bv->workWidth();
+               w = bv->text->workWidth(bv, const_cast<UpdatableInset *>(this));
        }
        if (w < 0) {
                return -1;
@@ -323,11 +340,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) {
+       if (topx_set && owner()) {
                w -= top_x;
-               if (owner()) {
-                       w += owner()->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
+               w -= 20;
        }
        if (w < 10) {
                w = 10;
@@ -338,11 +358,13 @@ int UpdatableInset::getMaxWidth(BufferView * bv, UpdatableInset const *) const
 
 LyXCursor const & Inset::cursor(BufferView * bv) const
 {
+       if (owner())
+               return owner()->getLyXText(bv, false)->cursor;
        return bv->text->cursor;
 }
 
 
-string const UpdatableInset::selectNextWord(BufferView *bv,
+string const UpdatableInset::selectNextWordToSpellcheck(BufferView *bv,
                                            float & value) const
 {
        // we have to unlock ourself in this function by default!
@@ -353,7 +375,7 @@ string const UpdatableInset::selectNextWord(BufferView *bv,
 
 
 bool UpdatableInset::searchForward(BufferView * bv, string const &,
-                                   bool const &, bool const &)
+                                   bool, bool)
 {
        // we have to unlock ourself in this function by default!
        bv->unlockInset(const_cast<UpdatableInset *>(this));
@@ -362,7 +384,7 @@ bool UpdatableInset::searchForward(BufferView * bv, string const &,
 
 
 bool UpdatableInset::searchBackward(BufferView * bv, string const &,
-                                    bool const &, bool const &)
+                                    bool, bool)
 {
        // we have to unlock ourself in this function by default!
        bv->unlockInset(const_cast<UpdatableInset *>(this));