X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetText.h;h=5bc7c523eb0fe9c11a355d760862a5788f90eba1;hb=e4c46abeb7385960c9dd42494e3c7c1f3e699b56;hp=52ea7afc7f82f76729f59a4b057fedfcddb7bb58;hpb=cf64064db71ddedb4deb888e63325cea8619a9cd;p=lyx.git

diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 52ea7afc7f..5bc7c523eb 100644
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -47,7 +47,7 @@ public:
 	void setBuffer(Buffer &);
 
 	///
-	Dimension const dimension(BufferView const &) const;
+	Dimension const dimensionHelper(BufferView const &) const;
 
 	/// empty inset to empty par
 	void clear();
@@ -59,10 +59,14 @@ public:
 	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
+	/// Drawing background is handled in draw
+	virtual void drawBackground(PainterInfo &, int, int) const {}
 	///
 	bool editable() const { return true; }
 	///
 	bool canTrackChanges() const { return true; }
+	/// Rely on RowPainter to draw the cue of inline insets.
+	bool canPaintChange(BufferView const &) const { return allowMultiPar(); }
 	///
 	InsetText * asInsetText() { return this; }
 	///
@@ -199,13 +203,14 @@ public:
 	/// returns the text to be used as tooltip
 	/// \param prefix: a string that will preced the tooltip,
 	/// e.g., "Index: ".
-	/// \param numlines: the number of lines in the tooltip
-	/// \param len: length of those lines
+	/// \param len: length of the resulting string
 	/// NOTE This routine is kind of slow. It's fine to use it within the 
 	/// GUI, but definitely do not try to use it in updateBuffer or anything
-	/// of that sort.
+	/// of that sort. (Note: unnecessary internal copies have been removed
+	/// since the previous note. The efficiency would have to be assessed
+	/// again by profiling.)
 	docstring toolTipText(docstring prefix = empty_docstring(),
-			size_t numlines = 5, size_t len = 80) const;
+	                      size_t len = 400) const;
 
 	///
 	std::string contextMenu(BufferView const &, int, int) const;
@@ -214,12 +219,6 @@ public:
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 protected:
-	///
-	InsetCaption const * getCaptionInset() const;
-	///
-	docstring getCaptionText(OutputParams const &) const;
-	///
-	docstring getCaptionHTML(OutputParams const &) const;
 	///
 	void iterateForToc(DocIterator const & cdit, bool output_active,
 					   UpdateType utype) const;
@@ -229,7 +228,7 @@ private:
 	///
 	ColorCode frame_color_;
 	///
-	mutable Text text_;
+	Text text_;
 };