X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathNest.h;h=3d4977d63c44e38a9d42c4dbf954bd8953760259;hb=9296344b9a26191a2092d175a51e357ecc35145d;hp=a503fb96db3563c7ce2f527c5ba8985db940ec35;hpb=0ce10160daadc904ab1221eaeef0d005694f0f0c;p=lyx.git

diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h
index a503fb96db..3d4977d63c 100644
--- a/src/mathed/InsetMathNest.h
+++ b/src/mathed/InsetMathNest.h
@@ -13,6 +13,7 @@
 #define MATH_NESTINSET_H
 
 #include "InsetMath.h"
+#include "MathData.h"
 
 #include <map>
 
@@ -32,16 +33,10 @@ public:
 	///
 	void setBuffer(Buffer &);
 
-	/// the size is usually some sort of convex hull of the cells
-	/// hides inset::metrics() intentionally!
-	void metrics(MetricsInfo const & mi) const;
+	/// Update the cells metrics
+	void cellsMetrics(MetricsInfo const & mi) const;
 	/// draw background if locked
 	void draw(PainterInfo & pi, int x, int y) const;
-	/// draw selection background
-	void drawSelection(PainterInfo & pi, int x, int y) const;
-	/// draw decorations.
-	void drawDecoration(PainterInfo & pi, int x, int y) const
-	{ drawMarkers(pi, x, y); }
 	///
 	void updateBuffer(ParIterator const &, UpdateType);
 	/// identifies NestInsets
@@ -52,7 +47,7 @@ public:
 	void cursorPos(BufferView const & bv, CursorSlice const & sl,
 		bool boundary, int & x, int & y) const;
 	///
-	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);
@@ -112,7 +107,7 @@ public:
 	///
 	bool setMouseHover(BufferView const * bv, bool mouse_hover) const;
 	///
-	bool mouseHovered(BufferView const * bv) const 
+	bool mouseHovered(BufferView const * bv) const
 		{ return mouse_hover_[bv]; }
 
 	///
@@ -134,6 +129,9 @@ public:
 	///
 	InsetCode lyxCode() const { return MATH_NEST_CODE; }
 
+	///
+	bool confirmDeletion() const { return nargs() > 0; }
+
 protected:
 	///
 	InsetMathNest(InsetMathNest const & inset);
@@ -182,9 +180,9 @@ private:
 	/// afterwards if found
 	bool findMacroToFoldUnfold(Cursor & searchCur, bool fold) const;
 	/// move cursor forward
-	bool cursorMathForward(Cursor & cur);
+	bool cursorMathForward(Cursor & cur, bool enter = true);
 	/// move cursor backwards
-	bool cursorMathBackward(Cursor & cur);
+	bool cursorMathBackward(Cursor & cur, bool enter = true);
 
 protected:
 	/// we store the cells in a vector
@@ -195,7 +193,7 @@ protected:
 	bool lock_;
 	///
 	mutable std::map<BufferView const *, bool> mouse_hover_;
-};	
+};