X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2FPainter.h;h=b4843e67646f1ace0c85bddd90c9ed658a9135dc;hb=50060053e36b3e9dfe03bc33ed3abac1eacc54b0;hp=c72d8133b972e05e9e070221efd3d3919a90eab8;hpb=80e2c85474fbad21dc8a40d74127a81447401b34;p=lyx.git

diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h
index c72d8133b9..b4843e6764 100644
--- a/src/frontends/Painter.h
+++ b/src/frontends/Painter.h
@@ -38,12 +38,7 @@ namespace frontend {
  *
  * The intention for a toolkit is that it uses these methods to paint
  * onto a backing pixmap. Only when expose events arrive via the event
- * queue (perhaps generated via Screen::expose), does the copy onto
- * the actual WorkArea widget take place. Paints are wrapped in (possibly
- * recursive) calls to start() and end() to facilitate the backing pixmap
- * management.
- *
- * Note that the methods return *this for convenience.
+ * queue, does the copy onto the actual WorkArea widget take place.
  *
  * Caution: All char_type and docstring arguments of the text drawing
  * methods of this class are no UCS4 chars or strings if the font is a
@@ -61,6 +56,8 @@ public:
 	/// possible line styles
 	enum line_style {
 		line_solid, //< solid line
+		line_solid_aliased, //< solid line, no anti-aliasing (used as a
+		                    // workaround to painting issues)
 		line_onoffdash //< dashes with spaces
 	};
 
@@ -133,28 +130,25 @@ public:
 	virtual void image(int x, int y, int w, int h,
 		graphics::Image const & image) = 0;
 
-	/** 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) = 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) = 0;
+
+	/// draw a char at position x, y (y is the baseline)
+	virtual void text(int x, int y, char_type c, FontInfo const & f) = 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,
-                     double wordspacing = 0.0) = 0;
+	virtual void text(int x, int y, docstring const & str, Font const & f,
+                      double wordspacing, double textwidth) = 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
 	 * \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) = 0;
+	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) = 0;
 
 	void setDrawingEnabled(bool drawing_enabled)
 	{ drawing_enabled_ = drawing_enabled; }
@@ -164,12 +158,6 @@ public:
 
 	double pixelRatio() const { return pixel_ratio_; }
 
-	/// draw a char at position x, y (y is the baseline)
-	/**
-	* \return the width of the drawn text.
-	*/
-	virtual int text(int x, int y, char_type c, FontInfo const & f) = 0;
-
 	/// draw the underbar, strikeout, uuline and uwave font attributes
 	virtual void textDecoration(FontInfo const & f, int x, int y, int width) = 0;