X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetcollapsable.h;h=4a4f2fec1975ec54032431f4d9d3c762db02ff0d;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=9d4ebbc1d0e86ad709daf08913dc6b7f2d456a8c;hpb=153ac7500c4626a4e0ed38bf2bf88163f953c910;p=lyx.git

diff --git a/src/insets/insetcollapsable.h b/src/insets/insetcollapsable.h
index 9d4ebbc1d0..4a4f2fec19 100644
--- a/src/insets/insetcollapsable.h
+++ b/src/insets/insetcollapsable.h
@@ -20,137 +20,90 @@
 #include "box.h"
 #include "lyxfont.h"
 
-class Painter;
+#include <string>
+
+namespace lyx {
+
 class LyXText;
 class Paragraph;
-class LyXCursor;
+class CursorSlice;
+
+namespace frontend { class Painter; }
 
 /** A collapsable text inset
 
 */
-class InsetCollapsable : public UpdatableInset {
+class InsetCollapsable : public InsetText {
 public:
 	///
 	static int const TEXT_TO_TOP_OFFSET = 2;
 	///
 	static int const TEXT_TO_BOTTOM_OFFSET = 2;
 	///
-	enum CollapseStatus {
-		Open,
-		Collapsed,
-		Inlined
-	};
-	/// inset is initially collapsed if bool = true
-	InsetCollapsable(BufferParams const &, bool collapsed = false);
+	InsetCollapsable(BufferParams const &, CollapseStatus status = Open);
 	///
-	InsetCollapsable(InsetCollapsable const & in);
+	InsetCollapsable(InsetCollapsable const & rhs);
 	///
 	void read(Buffer const &, LyXLex &);
 	///
 	void write(Buffer const &, std::ostream &) const;
 	///
-	void metrics(MetricsInfo &, Dimension &) const;
+	bool metrics(MetricsInfo &, Dimension &) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
+	void drawSelection(PainterInfo & pi, int x, int y) 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;
+	///
 	bool hitButton(FuncRequest const &) const;
 	///
-	std::string const getNewLabel(std::string const & l) const;
+	docstring const getNewLabel(docstring const & l) const;
 	///
 	EDITABLE editable() const;
 	/// can we go further down on mouse click?
 	bool descendable() const;
 	///
-	bool insetAllowed(InsetOld::Code code) const;
-	///
-	bool isTextInset() const { return true; }
-	///
-	int latex(Buffer const &, std::ostream &,
-		  OutputParams const &) const;
-	///
-	int plaintext(Buffer const &, std::ostream &,
-		  OutputParams const &) const;
-	///
-	int linuxdoc(Buffer const &, std::ostream &,
-		     OutputParams const &) const;
-	///
-	int docbook(Buffer const &, std::ostream &,
-		    OutputParams const & runparams) const;
+	void setLabel(docstring const & l);
 	///
-	void validate(LaTeXFeatures & features) const;
-	/// get the screen x,y of the cursor
-	void getCursorPos(int & x, int & y) const;
-	///
-	void setLabel(std::string const & l) const;
+	virtual void setButtonLabel() {}
 	///
 	void setLabelFont(LyXFont & f);
-#if 0
-	///
-	void setAutoCollapse(bool f);
-#endif
-	/// Appends \c list with all labels found within this inset.
-	void getLabelList(Buffer const &, std::vector<std::string> & list) const;
-	///
-	int scroll(bool recursive=true) const;
-	///
-	void scroll(BufferView *bv, float sx) const;
-	///
-	void scroll(BufferView *bv, int offset) const;
-	///
-	int numParagraphs() const;
-	///
-	LyXText * getText(int) const;
 	///
 	bool isOpen() const { return status_ == Open || status_ == Inlined; }
 	///
 	bool inlined() const { return status_ == Inlined; }
 	///
-	CollapseStatus status() const { return status_; }
+	CollapseStatus status() const;
 	///
-	void open();
+	bool allowSpellCheck() const { return true; }
 	///
-	void close();
+	bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
 	///
-	void markErased();
+	void setStatus(LCursor & cur, CollapseStatus st);
 	///
-	void addPreview(lyx::graphics::PreviewLoader &) const;
-	///
-	void setBackgroundColor(LColor_color);
-	///
-	virtual void setStatus(CollapseStatus st);
+	bool setMouseHover(bool mouse_hover);
 
 protected:
 	///
-	virtual
-	DispatchResult
-	priv_dispatch(FuncRequest const &, idx_type &, pos_type &);
-	///
-	void dimension_collapsed(Dimension &) const;
-	///
-	int height_collapsed() const;
+	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
 	///
-	void draw_collapsed(PainterInfo & pi, int x, int y) const;
-	///
-	int getMaxTextWidth(Painter & pain, UpdatableInset const *) const;
+	Dimension dimensionCollapsed() const;
 	///
 	Box const & buttonDim() const;
 	///
-	void edit(BufferView *, bool);
+	void edit(LCursor & cur, bool left);
 	///
-	void edit(BufferView *, int, int);
-
-private:
+	InsetBase * editXY(LCursor & cur, int x, int y);
 	///
-	DispatchResult lfunMouseRelease(FuncRequest const &);
+	void setInlined() { status_ = Inlined; }
+	/// Is the width forced to some value?
+	virtual bool hasFixedWidth() const { return false; }
 	///
-	FuncRequest adjustCommand(FuncRequest const &);
+	docstring floatName(std::string const & type, BufferParams const &);
 
-public:
-	///
-	mutable InsetText inset;
 protected:
-	///
-	mutable CollapseStatus status_;
 	///
 	LyXFont labelfont_;
 	///
@@ -160,11 +113,23 @@ protected:
 	///
 	mutable int topbaseline;
 	///
-	mutable std::string label;
-#if 0
+	mutable docstring label;
+private:
 	///
-	bool autocollapse;
-#endif
+	mutable CollapseStatus status_;
+	/// a substatus of the Open status, determined automatically in metrics
+	mutable bool openinlined_;
+	/// the inset will automatically open when the cursor is inside
+	mutable bool autoOpen_;
+	///
+	mutable Dimension textdim_;
+	/// changes color when mouse enters/leaves this inset
+	bool mouse_hover_;
 };
 
+// A helper function that pushes the cursor out of the inset.
+void leaveInset(LCursor & cur, InsetBase const & in);
+
+} // namespace lyx
+
 #endif