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

diff --git a/src/insets/inset.C b/src/insets/inset.C
index f473f151f4..c8eba90eb3 100644
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -34,14 +34,15 @@ using std::endl;
 unsigned int Inset::inset_id = 0;
 
 Inset::Inset()
-	: top_x(0), top_baseline(0), scx(0), id_(inset_id++), owner_(0),
+	: top_x(0), topx_set(false), top_baseline(0), scx(0),
+	  id_(inset_id++), owner_(0), par_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 +87,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 +142,24 @@ void Inset::id(int id_arg)
 	id_ = id_arg;
 }
 
+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()
@@ -154,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;
 }
 
 
@@ -222,10 +248,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 +327,45 @@ 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();
+	} 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;
+	}
+	return w;
 }
 
+
 LyXCursor const & Inset::cursor(BufferView * bv) const
 {
+	if (owner())
+		return owner()->getLyXText(bv, false)->cursor;
 	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,16 +373,18 @@ string UpdatableInset::selectNextWord(BufferView *bv, float & value) const
 	return string();
 }
 
+
 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));
 	return false;
 }
 
+
 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));