X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Frowpainter.h;h=9a8a7cdd5eb5e42f229e44d04c4eca296182c67e;hb=0b17cb113523fb23c43064709e9b6606fe80914c;hp=4fbdeaece25ede5a3d3b3b62f7635a1e89c726f5;hpb=5ddc612b735317d5b22553a63aad7879503e3950;p=lyx.git diff --git a/src/rowpainter.h b/src/rowpainter.h index 4fbdeaece2..9a8a7cdd5e 100644 --- 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,6 +14,8 @@ #ifndef ROWPAINTER_H #define ROWPAINTER_H +#include "Changes.h" + #include "support/types.h" namespace lyx { @@ -23,6 +25,7 @@ class BufferView; class Font; class FontInfo; class Inset; +class Language; class PainterInfo; class Paragraph; class ParagraphList; @@ -30,7 +33,6 @@ class ParagraphMetrics; class Row; class Text; class TextMetrics; -class ViewMetricsInfo; namespace frontend { class Painter; } @@ -55,7 +57,8 @@ public: void paintOnlyInsets(); private: - void paintForeignMark(double orig_x, Font const & font, int desc = 0); + void paintForeignMark(double orig_x, Language const * lang, int desc = 0); + void paintMisspelledMark(double orig_x, int desc); void paintHebrewComposeChar(pos_type & vpos, FontInfo const & font); void paintArabicComposeChar(pos_type & vpos, FontInfo const & font); void paintChars(pos_type & vpos, FontInfo const & font, @@ -63,13 +66,13 @@ private: int paintAppendixStart(int y); void paintFromPos(pos_type & vpos); void paintInset(Inset const * inset, pos_type const pos); - void paintHfill(pos_type const pos, pos_type const body_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; /// contains painting related information. PainterInfo & pi_; @@ -92,8 +95,8 @@ private: /// one of them is active at a time. Bidi & bidi_; - /// is row erased? (change tracking) - bool erased_; + /// row changed? (change tracking) + Change const change_; // Looks ugly - is double const xo_;