X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCollapsable.h;h=c7b6d65c3a4f193454ba8bc1dcd73d3a9d4ae19c;hb=e4c46abeb7385960c9dd42494e3c7c1f3e699b56;hp=b693f6bec1b57a76eb372bf4c08c686178188b45;hpb=f09a4ac03cbde4303afc9db3b404f7987e801d29;p=lyx.git

diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index b693f6bec1..c7b6d65c3a 100644
--- a/src/insets/InsetCollapsable.h
+++ b/src/insets/InsetCollapsable.h
@@ -14,11 +14,11 @@
 #ifndef INSETCOLLAPSABLE_H
 #define INSETCOLLAPSABLE_H
 
-#include "Inset.h"
 #include "InsetText.h"
 
 #include "Box.h"
-#include "TextClass.h"
+
+#include <map>
 
 namespace lyx {
 
@@ -33,17 +33,19 @@ namespace frontend { class Painter; }
 class InsetCollapsable : public InsetText {
 public:
 	///
-	InsetCollapsable(Buffer const &, InsetText::UsePlain = InsetText::PlainLayout);
+	InsetCollapsable(Buffer *, InsetText::UsePlain = InsetText::PlainLayout);
 	///
 	InsetCollapsable(InsetCollapsable const & rhs);
 	///
+	virtual ~InsetCollapsable();
+	///
 	InsetCollapsable * asInsetCollapsable() { return this; }
 	///
 	InsetCollapsable const * asInsetCollapsable() const { return this; }
 	///
 	docstring toolTip(BufferView const & bv, int x, int y) const;
 	///
-	docstring name() const { return from_ascii("Collapsable"); }
+	docstring layoutName() const { return from_ascii("Collapsable"); }
 	///
 	void read(Lexer &);
 	///
@@ -52,20 +54,22 @@ public:
 	void metrics(MetricsInfo &, Dimension &) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
+	///
+	virtual void drawBackground(PainterInfo &, int, int) const {}
 
 	/// return x,y of given position relative to the inset's baseline
 	void cursorPos(BufferView const & bv, CursorSlice const & sl,
 		bool boundary, int & x, int & y) const;
-	/// Returns true if (mouse) action is over the inset's button.
-	/// Always returns false when the inset does not have a
-	/// button.
-	bool hitButton(FuncRequest const &) const;
 	///
 	docstring const getNewLabel(docstring const & l) const;
 	///
 	bool editable() const;
 	///
 	bool hasSettings() const { return true; }
+	/// Returns true if coordinates are over the inset's button.
+	/// Always returns false when the inset does not have a
+	/// button.
+	bool clickable(BufferView const & bv, int x, int y) const;
 	/// can we go further down on mouse click?
 	bool descendable(BufferView const & bv) const;
 	///
@@ -75,11 +79,18 @@ public:
 	///
 	virtual docstring const buttonLabel(BufferView const &) const;
 	///
-	bool isOpen(BufferView const & bv) const 
+	bool isOpen(BufferView const & bv) const
 		{ return geometry(bv) != ButtonOnly; }
 	///
+	enum CollapseStatus {
+		Collapsed,
+		Open
+	};
+	///
+	virtual void setStatus(Cursor & cur, CollapseStatus st);
+	///
 	CollapseStatus status(BufferView const & bv) const;
-	/** Of the old CollapseStatus we only keep the values  
+	/** Of the old CollapseStatus we only keep the values
 	 *  Open and Collapsed.
 	 * We define a list of possible inset decoration
 	 * styles, and a list of possible (concrete, visual)
@@ -100,6 +111,10 @@ public:
 
 	/// Default looks
 	virtual InsetLayout::InsetDecoration decoration() const;
+	/// Inset font
+	virtual FontInfo getFont() const { return getLayout().font(); }
+	/// Label font
+	virtual FontInfo getLabelfont() const { return getLayout().labelfont(); }
 	///
 	enum Geometry {
 		TopButton,
@@ -113,16 +128,15 @@ public:
 	/// (status_), auto_open_[BufferView] and openinlined_,
 	/// and of course decoration().
 	Geometry geometry(BufferView const & bv) const;
-	/// Returns the geometry disregarding auto_open_
-	Geometry geometry() const;
 	///
-	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
+	bool canPaintChange(BufferView const & bv) const;
 	///
-	void setStatus(Cursor & cur, CollapseStatus st);
+	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
 	///
-	bool setMouseHover(bool mouse_hover);
+	bool setMouseHover(BufferView const * bv, bool mouse_hover) const;
 	///
-	ColorCode backgroundColor() const { return getLayout().bgcolor(); }
+	ColorCode backgroundColor(PainterInfo const &) const
+		{ return getLayout().bgcolor(); }
 	///
 	ColorCode labelColor() const { return getLayout().labelfont().color(); }
 	///
@@ -131,33 +145,41 @@ public:
 	///
 	virtual bool usePlainLayout() const { return true; }
 	///
-	virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+	std::string contextMenu(BufferView const & bv, int x, int y) const;
+	///
+	std::string contextMenuName() const;
 protected:
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
-	void edit(Cursor & cur, bool front, 
+	void edit(Cursor & cur, bool front,
 		EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
 	///
 	Inset * editXY(Cursor & cur, int x, int y);
 	///
-	docstring floatName(std::string const & type) const;
-	///
 	mutable CollapseStatus status_;
 private:
 	///
 	Dimension dimensionCollapsed(BufferView const & bv) const;
 	///
 	docstring labelstring_;
+
+	// These variables depend of the view in which the inset is displayed
+	struct View
+	{
+		/// The dimension of the inset button
+		Box button_dim_;
+		/// a substatus of the Open status, determined automatically in metrics
+		bool openinlined_;
+		/// the inset will automatically open when the cursor is inside. This is
+		/// dependent on the bufferview, compare with MathMacro::editing_.
+		bool auto_open_;
+		/// changes color when mouse enters/leaves this inset
+		bool mouse_hover_;
+	};
+
 	///
-	mutable Box button_dim;
-	/// a substatus of the Open status, determined automatically in metrics
-	mutable bool openinlined_;
-	/// the inset will automatically open when the cursor is inside. This is
-	/// dependent on the bufferview, compare with MathMacro::editing_.
-	mutable std::map<BufferView const *, bool> auto_open_;
-	/// changes color when mouse enters/leaves this inset
-	bool mouse_hover_;
+	mutable std::map<BufferView const *, View> view_;
 };
 
 } // namespace lyx