Paragraph:

[lyx.git] / src / rowpainter.h

diff --git a/src/rowpainter.h b/src/rowpainter.h
index 988892ab2a2bffa1789e548f8d1c9065441dadd7..59dfe2cc0030174ce302370075cd2f2869fea5d1 100644 (file)
--- 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,9 +100,6 @@ private:
        int const yo_;    // current baseline
        double x_;
        int width_;
-       double separator_;
-       double hfill_;
-       double label_hfill_;
 };
 
 } // namespace lyx