X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRowPainter.h;h=fc7c36f036b9469e67c1f8a8dbd45cc0b5f52654;hb=0b54650f0e7f1eae39f93444cac6c8525811975b;hp=f559eeb223a214a245746e5c45b5a38f68f665ea;hpb=f750d9b5cfbc2050e663044789ed9b44219b47fa;p=lyx.git

diff --git a/src/RowPainter.h b/src/RowPainter.h
index f559eeb223..fc7c36f036 100644
--- a/src/RowPainter.h
+++ b/src/RowPainter.h
@@ -15,6 +15,7 @@
 #define ROWPAINTER_H
 
 #include "Changes.h"
+#include "Row.h"
 
 #include "support/types.h"
 
@@ -28,8 +29,6 @@ class Language;
 class PainterInfo;
 class Paragraph;
 class ParagraphList;
-class ParagraphMetrics;
-class Row;
 class Text;
 class TextMetrics;
 
@@ -43,7 +42,7 @@ class RowPainter {
 public:
 	/// initialise and run painter
 	RowPainter(PainterInfo & pi, Text const & text,
-		pit_type pit, Row const & row, int x, int y);
+	           Row const & row, int x, int y);
 
 	/// paint various parts
 	/// FIXME: transfer to TextMetrics
@@ -52,27 +51,24 @@ public:
 	void paintChangeBar() const;
 	void paintTooLargeMarks(bool const left, bool const right) const;
 	void paintFirst() const;
-	void paintLast();
+	void paintLast() const;
 	void paintText();
 	void paintOnlyInsets();
 	void paintSelection() const;
 
 private:
-	void paintSeparator(double width, Font const & font);
-	void paintForeignMark(double orig_x, Language const * lang, int desc = 0) const;
-	void paintStringAndSel(docstring const & str, Font const & font,
-                         Change const & change,
-                         pos_type start_pos, pos_type end_pos);
-	void paintMisspelledMark(double orig_x,
-	                         docstring const & str, Font const & font,
-	                         pos_type pos, bool changed) const;
-	void paintChange(double orig_x , Font const & font, Change const & change) const;
-	int paintAppendixStart(int y) const;
-	void paintInset(Inset const * inset, Font const & font,
-                    Change const & change, pos_type const pos);
-
-	/// return the label font for this row
-	FontInfo labelFont() const;
+	void paintLanguageMarkings(Row::Element const & e) const;
+	void paintForeignMark(Row::Element const & e) const;
+	void paintNoSpellingMark(Row::Element const & e) const;
+	void paintStringAndSel(Row::Element const & e) const;
+	void paintTextDecoration(Row::Element const & e) const;
+	void paintMisspelledMark(Row::Element const & e) const;
+	void paintChange(Row::Element const & e) const;
+	void paintAppendixStart(int y) const;
+	void paintInset(Row::Element const & e) const;
+
+	/// return the label font for this row (end label when \c end is true)
+	FontInfo labelFont(bool end) const;
 
 	///
 	void paintLabel() const;
@@ -85,16 +81,14 @@ private:
 
 	/// Text for the row
 	Text const & text_;
-	TextMetrics const & text_metrics_;
+	TextMetrics const & tm_;
 	ParagraphList const & pars_;
 
 	/// The row to paint
 	Row const & row_;
 
 	/// Row's paragraph
-	pit_type const pit_;
 	Paragraph const & par_;
-	ParagraphMetrics const & pm_;
 
 	/// row changed? (change tracking)
 	Change const change_;
@@ -103,11 +97,6 @@ private:
 	double const xo_;
 	int const yo_;    // current baseline
 	double x_;
-	int width_;
-	int solid_line_thickness_;
-	int solid_line_offset_;
-	int dotted_line_thickness_;
-	int dotted_line_offset_;
 };
 
 } // namespace lyx