X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMetricsInfo.h;h=1508eb345f9e751086704101de6c7912b8a43214;hb=9b18a9b609c0af78b4bb08667fd8e02ebd897d5e;hp=066d87ce3f1f5b074b4a328e6d2d7ff673eefa94;hpb=732395ef1e7b0a4fe3567d1205af0ebd92f598e6;p=lyx.git

diff --git a/src/MetricsInfo.h b/src/MetricsInfo.h
index 066d87ce3f..1508eb345f 100644
--- a/src/MetricsInfo.h
+++ b/src/MetricsInfo.h
@@ -95,12 +95,14 @@ public:
 	MetricsInfo();
 	///
 	MetricsInfo(BufferView * bv, FontInfo font, int textwidth,
-	            MacroContext const & mc);
+	            MacroContext const & mc, bool vm);
 
 	///
 	MetricsBase base;
 	/// The context to resolve macros
 	MacroContext const & macrocontext;
+	/// Are we at the start of a paragraph (vertical mode)?
+	bool vmode;
 };
 
 
@@ -116,11 +118,11 @@ public:
 	void draw(int x, int y, char_type c);
 	///
 	void draw(int x, int y, docstring const & str);
-	/// Determines the background color for the specified inset based on the
+	/// Determines the background color based on the
 	/// selection state, the background color inherited from the parent inset
-	/// and the inset's own background color.
+	/// and the inset's own background color (if one is specified).
 	/// \param sel whether to take the selection state into account
-	ColorCode backgroundColor(Inset const * inset, bool sel = true) const;
+	ColorCode backgroundColor(Inset const * inset = nullptr, bool sel = true) const;
 
 	/// Determines the text color based on the intended color, the
 	/// change tracking state and the selection state.
@@ -134,7 +136,7 @@ public:
 	/// Whether the text at this point is right-to-left (for insets)
 	bool ltr_pos;
 	/// The change the parent is part of (change tracking)
-	Change change_;
+	Change change;
 	/// Whether the parent is selected as a whole
 	bool selected;
 	/// Whether the spell checker is enabled for the parent