X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2FPainter.h;h=b4843e67646f1ace0c85bddd90c9ed658a9135dc;hb=50060053e36b3e9dfe03bc33ed3abac1eacc54b0;hp=21067682e601867f0ec52551ac017f606cbaac3b;hpb=333f6fcf07b35f240bcc1190dd21b0dc068a9129;p=lyx.git diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h index 21067682e6..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,21 +130,17 @@ public: virtual void image(int x, int y, int w, int h, graphics::Image const & image) = 0; - /** draw a character 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). + virtual void text(int x, int y, docstring const & str, FontInfo const & f) = 0; - /** draw a string at position x, y (y is the baseline). The - * text direction is given by \c rtl. - */ - virtual void text(int x, int y, docstring const & str, FontInfo const & f, - bool rtl = false, double wordspacing = 0.0) = 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. */ virtual void text(int x, int y, docstring const & str, Font const & f, - double wordspacing = 0.0) = 0; + 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 @@ -155,7 +148,7 @@ public: */ virtual void text(int x, int y, docstring const & str, Font const & f, Color other, size_type from, size_type to, - double const wordspacing) = 0; + double wordspacing, double textwidth) = 0; void setDrawingEnabled(bool drawing_enabled) { drawing_enabled_ = drawing_enabled; }