X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finset.C;h=c8eba90eb3bfe80dd10e5e93b8149439b69f5a1c;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=1b187425a5434725cbceb589d9a22c7e504a0154;hpb=da7583ab70f95422e8b0b8232fc3af39aedfab10;p=lyx.git

diff --git a/src/insets/inset.C b/src/insets/inset.C
index 1b187425a5..c8eba90eb3 100644
--- 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,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 {
@@ -324,19 +341,14 @@ int UpdatableInset::getMaxWidth(BufferView * bv, UpdatableInset const *) const
 	if ((w - ((2 * TEXT_TO_INSET_OFFSET) + 5)) >= 0)
 		w -= (2 * TEXT_TO_INSET_OFFSET) + 5;
 	if (topx_set && owner()) {
-		lyxerr << "topx_set && owner()\n";
 		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;
 	}
@@ -346,6 +358,8 @@ 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;
 }
 
@@ -361,7 +375,7 @@ string const UpdatableInset::selectNextWordToSpellcheck(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));
@@ -370,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));