X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Frowpainter.h;h=480a2dd56c58a946e7fe99626795e1edc5131ed5;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=76ac59116e513f19097c3fbecb388071312b77e7;hpb=f614d46ca1f286c2afcbb7688f32b2a40037a885;p=lyx.git diff --git a/src/rowpainter.h b/src/rowpainter.h index 76ac59116e..480a2dd56c 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 { @@ -53,23 +55,32 @@ 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 paintMisspelledMark(double orig_x, bool changed); 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 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_; @@ -92,17 +103,18 @@ 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_; + float solid_line_thickness_; + int solid_line_offset_; + float dotted_line_thickness_; + int dotted_line_offset_; }; } // namespace lyx