Amend f441590c

[lyx.git] / src / frontends / qt4 / GuiPainter.h

diff --git a/src/frontends/qt4/GuiPainter.h b/src/frontends/qt4/GuiPainter.h
index 5afe5a50091a1714e66b3f461ab38cf7da0d8812..eadf9851669141a6c7a677f13c76afc71c661cad 100644 (file)
--- a/src/frontends/qt4/GuiPainter.h
+++ b/src/frontends/qt4/GuiPainter.h
@@ -91,13 +91,15 @@ public:
         * text direction is given by \c rtl.
         * \return the width of the drawn text.
         */
-       virtual int text(int x, int y, docstring const & str, FontInfo const & f, bool rtl = false);
+       virtual int text(int x, int y, docstring const & str, FontInfo const & f,
+                     bool rtl = false, double wordspacing = 0.0);
 
        /** draw a string at position x, y (y is the baseline). The
         * text direction is enforced by the \c Font.
         * \return the width of the drawn text.
         */
-       virtual int text(int x, int y, docstring const & str, Font const & f);
+       virtual int text(int x, int y, docstring const & str, Font const & f,
+                     double wordspacing = 0.0);
 
        /** draw a string at position x, y (y is the baseline), but
         * make sure that the part between \c from and \c to is in
@@ -105,7 +107,8 @@ public:
         * \return the width of the drawn text.
         */
        virtual int text(int x, int y, docstring const & str, Font const & f,
-                        Color other, size_type from, size_type to);
+                     Color other, size_type from, size_type to,
+                     double const wordspacing);
 
        /// draw a char at position x, y (y is the baseline)
        virtual int text(int x, int y, char_type c, FontInfo const & f);
@@ -144,7 +147,7 @@ public:
 private:
        /// check the font, and if set, draw an underline
        void underline(FontInfo const & f,
-               int x, int y, int width);
+                      int x, int y, int width, line_style ls = line_solid);
 
        /// check the font, and if set, draw an dashed underline
        void dashedUnderline(FontInfo const & f,
@@ -165,6 +168,9 @@ private:
        void setQPainterPen(QColor const & col,
                line_style ls = line_solid, int lw = thin_line);
 
+       // Helper for text() method
+       void do_drawText(int x, int y, QString str, bool rtl, FontInfo const & f, QFont ff);
+
        QColor current_color_;
        Painter::line_style current_ls_;
        int current_lw_;