X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRowPainter.h;h=99f0c8c515be5463dd95e9c4a30a23400ede876d;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=cb70f5d8a9b478d46df7578155a89fd8462224b7;hpb=b917c4e40f9f5cd3d101444600eddafcca54d6e3;p=lyx.git diff --git a/src/RowPainter.h b/src/RowPainter.h index cb70f5d8a9..99f0c8c515 100644 --- a/src/RowPainter.h +++ b/src/RowPainter.h @@ -29,7 +29,6 @@ class Language; class PainterInfo; class Paragraph; class ParagraphList; -class ParagraphMetrics; class Text; class TextMetrics; @@ -43,7 +42,7 @@ class RowPainter { public: /// initialise and run painter RowPainter(PainterInfo & pi, Text const & text, - pit_type pit, Row const & row, int x, int y); + Row const & row, int x, int y); /// paint various parts /// FIXME: transfer to TextMetrics @@ -52,19 +51,18 @@ public: void paintChangeBar() const; void paintTooLargeMarks(bool const left, bool const right) const; void paintFirst() const; - void paintLast(); + void paintLast() const; void paintText(); void paintOnlyInsets(); void paintSelection() const; private: - void paintSeparator(double width, Font const & font); - void paintForeignMark(double orig_x, Language const * lang, int desc = 0) const; - void paintStringAndSel(Row::Element const & e); - void paintMisspelledMark(double orig_x, Row::Element const & e) const; - void paintChange(double orig_x , Font const & font, Change const & change) const; + void paintForeignMark(Row::Element const & e) const; + void paintStringAndSel(Row::Element const & e) const; + void paintMisspelledMark(Row::Element const & e) const; + void paintChange(Row::Element const & e) const; void paintAppendixStart(int y) const; - void paintInset(Row::Element const & e); + void paintInset(Row::Element const & e) const; /// return the label font for this row FontInfo labelFont() const; @@ -80,16 +78,14 @@ private: /// Text for the row Text const & text_; - TextMetrics const & text_metrics_; + TextMetrics const & tm_; ParagraphList const & pars_; /// The row to paint Row const & row_; /// Row's paragraph - pit_type const pit_; Paragraph const & par_; - ParagraphMetrics const & pm_; /// row changed? (change tracking) Change const change_; @@ -98,10 +94,6 @@ private: double const xo_; int const yo_; // current baseline double x_; - int width_; - int solid_line_thickness_; - int solid_line_offset_; - int dotted_line_thickness_; }; } // namespace lyx