X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Frowpainter.h;h=9a8a7cdd5eb5e42f229e44d04c4eca296182c67e;hb=3c957e1bb1ca487cb5bb9b02145c009a7f5fe02d;hp=7304cd8f1961be6a0594c402ba5360585319de06;hpb=ed1487dd8eeb86d20320472837c4ffdb36111a97;p=lyx.git

diff --git a/src/rowpainter.h b/src/rowpainter.h
index 7304cd8f19..9a8a7cdd5e 100644
--- a/src/rowpainter.h
+++ b/src/rowpainter.h
@@ -6,7 +6,7 @@
  *
  * \author various
  * \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -14,6 +14,8 @@
 #ifndef ROWPAINTER_H
 #define ROWPAINTER_H
 
+#include "Changes.h"
+
 #include "support/types.h"
 
 namespace lyx {
@@ -21,7 +23,9 @@ namespace lyx {
 class Bidi;
 class BufferView;
 class Font;
+class FontInfo;
 class Inset;
+class Language;
 class PainterInfo;
 class Paragraph;
 class ParagraphList;
@@ -29,7 +33,6 @@ class ParagraphMetrics;
 class Row;
 class Text;
 class TextMetrics;
-class ViewMetricsInfo;
 
 namespace frontend { class Painter; }
 
@@ -54,21 +57,22 @@ public:
 	void paintOnlyInsets();
 
 private:
-	void paintForeignMark(double orig_x, Font const & font, int desc = 0);
-	void paintHebrewComposeChar(pos_type & vpos, Font const & font);
-	void paintArabicComposeChar(pos_type & vpos, Font const & font);
-	void paintChars(pos_type & vpos, Font const & font,
+	void paintForeignMark(double orig_x, Language const * lang, int desc = 0);
+	void paintMisspelledMark(double orig_x, int desc);
+	void paintHebrewComposeChar(pos_type & vpos, FontInfo const & font);
+	void paintArabicComposeChar(pos_type & vpos, FontInfo const & font);
+	void paintChars(pos_type & vpos, FontInfo const & font,
 			bool hebrew, bool arabic);
 	int paintAppendixStart(int y);
 	void paintFromPos(pos_type & vpos);
 	void paintInset(Inset const * inset, pos_type const pos);
-	void paintHfill(pos_type const pos, pos_type const body_pos);
-
+	void paintInlineCompletion(Font const & font);
+	
 	/// return left margin
 	int leftMargin() const;
 
 	/// return the label font for this row
-	Font const getLabelFont() const;
+	FontInfo labelFont() const;
 
 	/// contains painting related information.
 	PainterInfo & pi_;
@@ -91,8 +95,8 @@ private:
 	/// one of them is active at a time.
 	Bidi & bidi_;
 
-	/// is row erased? (change tracking)
-	bool erased_;
+	/// row changed? (change tracking)
+	Change const change_;
 
 	// Looks ugly - is
 	double const xo_;