X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FRowPainter.h;h=dc43eaa4ad7e8f185c2128934ba8b2118142e106;hb=5d13d8c78372c1cd5a0f6c3f451bacac55015cb3;hp=5e714ce759d84d238490fc6b934ac046140b2e85;hpb=463bd17d755820966e97f474f617cf585079968e;p=lyx.git

diff --git a/src/RowPainter.h b/src/RowPainter.h
index 5e714ce759..dc43eaa4ad 100644
--- a/src/RowPainter.h
+++ b/src/RowPainter.h
@@ -14,8 +14,8 @@
 #ifndef ROWPAINTER_H
 #define ROWPAINTER_H
 
-#include "Bidi.h"
 #include "Changes.h"
+#include "Row.h"
 
 #include "support/types.h"
 
@@ -29,28 +29,11 @@ class Language;
 class PainterInfo;
 class Paragraph;
 class ParagraphList;
-class ParagraphMetrics;
-class Row;
 class Text;
 class TextMetrics;
 
 namespace frontend { class Painter; }
 
-/**
- * FIXME: Re-implement row painting using row elements.
- *
- * This is not difficult in principle, but the code is intricate and
- * needs some careful analysis. The first thing that needs to be done
- * is to break row elements with the same criteria. Currently breakRow
- * does not consider on-the-fly spell-checking, but it is not clear to
- * me that it is required. Moreover, this thing would only work if we
- * are sure that the Row object is up-to-date when drawing happens.
- * This depends on the update machinery.
- *
- * This would allow to get rid of the Bidi class.
- */
-
-
 /**
  * A class used for painting an individual row of text.
  * FIXME: get rid of that class.
@@ -59,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
@@ -68,23 +51,19 @@ 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 orig_x, double width, FontInfo const & font);
-	void paintForeignMark(double orig_x, Language const * lang, int desc = 0) const;
-	void paintMisspelledMark(double orig_x, bool changed) const;
-	void paintChars(pos_type & vpos, Font const & font);
-	int paintAppendixStart(int y) const;
-	void paintFromPos(pos_type & vpos, bool changed);
-	void paintInset(Inset const * inset, pos_type const pos);
-	void paintInlineCompletion(Font const & font);
-
-	/// return left margin
-	int leftMargin() const;
+	void paintForeignMark(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
 	FontInfo labelFont() const;
@@ -100,19 +79,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_;
-
-	/// bidi cache
-	Bidi bidi_;
 
 	/// row changed? (change tracking)
 	Change const change_;
@@ -121,11 +95,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