Reintroduce the code related to InsetEnvSeparator

[lyx.git] / src / rowpainter.h

diff --git a/src/rowpainter.h b/src/rowpainter.h
index 874a28b00047cfae86de0ae62afc0666e5c23310..ae1a59031045855d19bcfce764ba0cafe2773900 100644 (file)
--- 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,11 +14,13 @@
 #ifndef ROWPAINTER_H
 #define ROWPAINTER_H
 
+#include "Bidi.h"
+#include "Changes.h"
+
 #include "support/types.h"
 
 namespace lyx {
 
-class Bidi;
 class BufferView;
 class Font;
 class FontInfo;
@@ -42,7 +44,7 @@ class RowPainter {
 public:
        /// initialise and run painter
        RowPainter(PainterInfo & pi, Text const & text,
-               pit_type pit, Row const & row, Bidi & bidi, int x, int y);
+               pit_type pit, Row const & row, int x, int y);
 
        /// paint various parts
        /// FIXME: transfer to TextMetrics
@@ -53,22 +55,29 @@ public:
        void paintLast();
        void paintText();
        void paintOnlyInsets();
+       void paintSelection();
 
 private:
+       void paintSeparator(double orig_x, double width, FontInfo 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);
+       void paintMisspelledMark(double orig_x, bool changed);
+       void paintChars(pos_type & vpos, Font const & font);
        int paintAppendixStart(int y);
-       void paintFromPos(pos_type & vpos);
+       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;
 
        /// return the label font for this row
-       FontInfo const getLabelFont() const;
+       FontInfo labelFont() const;
+
+       ///
+       void paintLabel();
+       ///
+       void paintTopLevelLabel();
+
 
        /// contains painting related information.
        PainterInfo & pi_;
@@ -86,19 +95,21 @@ private:
        Paragraph const & par_;
        ParagraphMetrics const & pm_;
 
-       /// bidi cache, comes from outside the rowpainter because
-       /// rowpainters are normally created in a for loop and there only
-       /// one of them is active at a time.
-       Bidi & bidi_;
+       /// bidi cache
+       Bidi bidi_;
 
-       /// is row erased? (change tracking)
-       bool erased_;
+       /// row changed? (change tracking)
+       Change const change_;
 
        // Looks ugly - is
        double const xo_;
        int const yo_;    // current baseline
        double x_;
        int width_;
+       float solid_line_thickness_;
+       int solid_line_offset_;
+       float dotted_line_thickness_;
+       int dotted_line_offset_;
 };
 
 } // namespace lyx