X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Frowpainter.h;h=9a8a7cdd5eb5e42f229e44d04c4eca296182c67e;hb=0b17cb113523fb23c43064709e9b6606fe80914c;hp=854e665084d6d458219f222f72ec18467e3fdf3d;hpb=1bf7b59d60a30aed7d418cb63e9f12610635f7e6;p=lyx.git diff --git a/src/rowpainter.h b/src/rowpainter.h index 854e665084..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 { @@ -56,6 +58,7 @@ public: private: 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,12 +66,13 @@ private: int paintAppendixStart(int y); void paintFromPos(pos_type & vpos); 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; /// contains painting related information. PainterInfo & pi_; @@ -91,17 +95,14 @@ 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_; int const yo_; // current baseline double x_; int width_; - - // -1 if the inline completion is not in this paragraph. - pos_type inlineCompletionVPos_; }; } // namespace lyx