Merge branch 'master' into biblatex2

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

diff --git a/src/frontends/qt4/GuiPainter.h b/src/frontends/qt4/GuiPainter.h
index 3819ff378f883fab8f9da67d47737d351a2dfc43..cb091075d98ec21b61bf19c7e7413e2260648c8e 100644 (file)
--- a/src/frontends/qt4/GuiPainter.h
+++ b/src/frontends/qt4/GuiPainter.h
@@ -105,31 +105,25 @@ public:
        virtual void image(int x, int y, int w, int h,
                lyx::graphics::Image const & image);
 
-       /** draw a string at position x, y (y is the baseline). The
-        * 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, double wordspacing = 0.0);
+       /// draw a string at position x, y (y is the baseline).
+       virtual void text(int x, int y, docstring const & str, FontInfo const & f);
+
+       /// draw a char at position x, y (y is the baseline)
+       virtual void text(int x, int y, char_type c, FontInfo const & f);
 
        /** 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,
-                     double wordspacing = 0.0);
+       virtual void text(int x, int y, docstring const & str, Font const & f,
+                      double wordspacing, double textwidth);
 
        /** 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
         * \c other color. 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,
-                     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);
+       virtual void text(int x, int y, docstring const & str, Font const & f,
+                         Color other, size_type from, size_type to,
+                      double wordspacing, double textwidth);
 
        ///
        virtual void textDecoration(FontInfo const & f, int x, int y, int width);
@@ -139,11 +133,11 @@ public:
                FontInfo const & font, bool mouseHover);
 
        /// start monochrome painting mode, i.e. map every color into [min,max]
-       virtual void enterMonochromeMode(Color const & min, 
+       virtual void enterMonochromeMode(Color const & min,
                Color const & max);
        /// leave monochrome painting mode
        virtual void leaveMonochromeMode();
-       
+
        /**
         * Draw a string and enclose it inside a rectangle. If
         * back color is specified, the background is cleared with
@@ -186,8 +180,16 @@ private:
        void setQPainterPen(QColor const & col,
                line_style ls = line_solid, int lw = thin_line);
 
+       // Direction for painting text
+       enum Direction { LtR, RtL, Auto };
+
        // Helper for text() method
-       void do_drawText(int x, int y, QString str, bool rtl, FontInfo const & f, QFont ff);
+       void do_drawText(int x, int y, QString str, Direction dir, FontInfo const & f, QFont ff);
+
+       // Real text() method
+       void text(int x, int y, docstring const & s,
+              FontInfo const & f, Direction const dir,
+              double const wordspacing, double tw);
 
        QColor current_color_;
        Painter::line_style current_ls_;
@@ -203,7 +205,8 @@ private:
        /// possibly apply monochrome mode
        QColor filterColor(QColor const & col);
        ///
-       QString generateStringSignature(QString const & str, FontInfo const & f);       
+       QString generateStringSignature(QString const & str, FontInfo const & f,
+                                       double wordspacing);
 };
 
 } // namespace frontend