X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Frowpainter.h;h=59dfe2cc0030174ce302370075cd2f2869fea5d1;hb=6a8219c190315a63426e6798290cc3a04dbc0f09;hp=6a4561835aa07ab7fcc7c8a30785bf4d09717e3a;hpb=971c543b34253e6ded4afdd644fee8ba89df2b05;p=lyx.git

diff --git a/src/rowpainter.h b/src/rowpainter.h
index 6a4561835a..59dfe2cc00 100644
--- a/src/rowpainter.h
+++ b/src/rowpainter.h
@@ -21,6 +21,9 @@ namespace lyx {
 class Bidi;
 class BufferView;
 class Font;
+class FontInfo;
+class Inset;
+class Language;
 class PainterInfo;
 class Paragraph;
 class ParagraphList;
@@ -28,7 +31,6 @@ class ParagraphMetrics;
 class Row;
 class Text;
 class TextMetrics;
-class ViewMetricsInfo;
 
 namespace frontend { class Painter; }
 
@@ -50,28 +52,27 @@ public:
 	void paintFirst();
 	void paintLast();
 	void paintText();
+	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 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(pos_type const pos, Font const & font);
-
+	void paintInset(Inset const * inset, pos_type const pos);
+	void paintInlineCompletion(Font const & font);
+	
 	/// return left margin
 	int leftMargin() const;
 
 	/// return the label font for this row
-	Font const getLabelFont() const;
-
-	/// bufferview to paint on
-	BufferView & bv_;
+	FontInfo labelFont() const;
 
-	/// Painter to use
-	frontend::Painter & pain_;
+	/// contains painting related information.
+	PainterInfo & pi_;
 
 	/// Text for the row
 	Text const & text_;
@@ -99,20 +100,8 @@ private:
 	int const yo_;    // current baseline
 	double x_;
 	int width_;
-	double separator_;
-	double hfill_;
-	double label_hfill_;
 };
 
-/// some space for drawing the 'nested' markers (in pixel)
-inline int nestMargin() { return 15; }
-
-/// margin for changebar
-inline int changebarMargin() { return 12; }
-
-/// right margin
-inline int rightMargin() { return 10; }
-
 } // namespace lyx
 
 #endif // ROWPAINTER_H