X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCollapsable.h;h=fda6f84e3c4d2397ca5b2b05c9ad905c69e8c462;hb=a3c84666b2dbfc75c9a80cf4f94612149cb2b570;hp=2308ae753f385c89f41396939109bb46dad2764f;hpb=7eb04d61d98563ea47785e5e8f948872717c24ec;p=lyx.git

diff --git a/src/insets/InsetCollapsable.h b/src/insets/InsetCollapsable.h
index 2308ae753f..fda6f84e3c 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 {
 
@@ -32,14 +32,13 @@ namespace frontend { class Painter; }
 */
 class InsetCollapsable : public InsetText {
 public:
-	///	By default, InsetCollapsable uses the plain layout. If you 
-	/// want to override this in a subclass, you'll need to call 
-	/// Paragraph::setDefaultLayout() in its constructor. See
-	/// InsetBranch for an example.
-	InsetCollapsable(Buffer const &);
+	///
+	InsetCollapsable(Buffer *, InsetText::UsePlain = InsetText::PlainLayout);
 	///
 	InsetCollapsable(InsetCollapsable const & rhs);
 	///
+	virtual ~InsetCollapsable();
+	///
 	InsetCollapsable * asInsetCollapsable() { return this; }
 	///
 	InsetCollapsable const * asInsetCollapsable() const { return this; }
@@ -48,17 +47,6 @@ public:
 	///
 	docstring name() const { return from_ascii("Collapsable"); }
 	///
-	InsetLayout const & getLayout(BufferParams const &) const { return *layout_; }
-	///
-	InsetLayout const & getLayout() const { return *layout_; } 
-	///
-	void setLayout(BufferParams const &);
-	/// (Re-)set the character style parameters from \p tc according
-	/// to name()
-	void setLayout(DocumentClass const * const tc);
-	///
-	virtual bool usePlainLayout() { return true; }
-	///
 	void read(Lexer &);
 	///
 	void write(std::ostream &) const;
@@ -77,7 +65,11 @@ public:
 	///
 	docstring const getNewLabel(docstring const & l) const;
 	///
-	EDITABLE editable(BufferView const & bv) const;
+	bool editable() const;
+	///
+	bool hasSettings() const { return true; }
+	///
+	bool clickable(int x, int y) const;
 	/// can we go further down on mouse click?
 	bool descendable(BufferView const & bv) const;
 	///
@@ -85,12 +77,18 @@ public:
 	///
 	virtual void setButtonLabel() {}
 	///
-	virtual docstring const buttonLabel(BufferView const & bv) const
-		{ return labelstring_; }
+	virtual docstring const buttonLabel(BufferView const &) 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  
 	 *  Open and Collapsed.
@@ -108,7 +106,7 @@ public:
 	 *   Conglomerate | SubLabel            Corners
 	 *   ---------------------------------------------
 	 *   *) toggled by openinlined_
-	 *   x) toggled by autoOpen_
+	 *   x) toggled by auto_open_
 	 */
 
 	/// Default looks
@@ -123,45 +121,29 @@ public:
 		Corners
 	};
 	/// Returns the geometry based on CollapseStatus
-	/// (status_), autoOpen_ and openinlined_, and of
-	/// course decoration().
+	/// (status_), auto_open_[BufferView] and openinlined_,
+	/// and of course decoration().
 	Geometry geometry(BufferView const & bv) const;
-	/// Allow spellchecking, except for insets with latex_language
-	bool allowSpellCheck() const { return !forceLTR(); }
-	///
-	bool allowMultiPar() const;
+	/// Returns the geometry disregarding auto_open_
+	Geometry geometry() const;
 	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
 	///
-	void setStatus(Cursor & cur, CollapseStatus st);
-	///
-	bool setMouseHover(bool mouse_hover);
-	///
-	ColorCode backgroundColor() const { return layout_->bgcolor(); }
+	bool setMouseHover(BufferView const * bv, bool mouse_hover) const;
 	///
-	int latex(odocstream &, OutputParams const &) const;
+	ColorCode backgroundColor(PainterInfo const &) const
+		{ return getLayout().bgcolor(); }
 	///
-	int docbook(odocstream &, OutputParams const &) const;
-	///
-	void validate(LaTeXFeatures &) const;
+	ColorCode labelColor() const { return getLayout().labelfont().color(); }
 	///
 	InsetCode lyxCode() const { return COLLAPSABLE_CODE; }
 
-	/// Allow multiple blanks
-	virtual bool isFreeSpacing() const { return layout_->isFreeSpacing(); }
-	/// Don't eliminate empty paragraphs
-	virtual bool allowEmpty() const { return layout_->isKeepEmpty(); }
-	/// Force inset into LTR environment if surroundings are RTL?
-	virtual bool forceLTR() const { return layout_->isForceLtr(); }
 	///
 	virtual bool usePlainLayout() const { return true; }
-	/// Is this inset's layout defined in the document's textclass?
-	/// May be wrong after textclass change or paste from another document
-	bool undefined() const;
-	/// the string that is passed to the TOC
-	void tocString(odocstream &) const;
 	///
 	virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+	///
+	docstring floatName(std::string const & type) const;
 protected:
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
@@ -171,23 +153,11 @@ protected:
 	///
 	Inset * editXY(Cursor & cur, int x, int y);
 	///
-	docstring floatName(std::string const & type, BufferParams const &) const;
-	///
-	virtual void resetParagraphsFont();
-	///
 	mutable CollapseStatus status_;
 private:
-	/// cache for the layout_. Make sure it is in sync with the document class!
-	InsetLayout const * layout_;
 	///
 	Dimension dimensionCollapsed(BufferView const & bv) const;
 	///
-	/// should paragraphs be forced to use the empty layout?
-	virtual bool forcePlainLayout(idx_type = 0) const 
-		{ return getLayout().forcePlainLayout(); }
-	/// should the user be allowed to customize alignment, etc.?
-	virtual bool allowParagraphCustomization(idx_type = 0) const 
-		{ return getLayout().allowParagraphCustomization(); }
 	docstring labelstring_;
 	///
 	mutable Box button_dim;
@@ -197,7 +167,7 @@ private:
 	/// 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 *, bool> mouse_hover_;
 };
 
 } // namespace lyx