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 edf512538109cdd55b2161cfd79f5c46d2e37432..c8eba90eb3bfe80dd10e5e93b8149439b69f5a1c 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -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
 
@@ -322,7 +328,7 @@ 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 {
@@ -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;
        }