More GuiInfo usability work

[lyx.git] / src / frontends / Painter.h

diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h
index b4843e67646f1ace0c85bddd90c9ed658a9135dc..17253b2f44dae76fb7d5eebcb55f01bd5d28eb51 100644 (file)
--- a/src/frontends/Painter.h
+++ b/src/frontends/Painter.h
@@ -49,7 +49,7 @@ namespace frontend {
  */
 class Painter {
 public:
-       Painter(double pixel_ratio) : drawing_enabled_(true), pixel_ratio_(pixel_ratio) {}
+       Painter(double pixel_ratio) : pixel_ratio_(pixel_ratio) {}
 
        static const int thin_line;
 
@@ -123,9 +123,6 @@ public:
        /// draw a pixel
        virtual void point(int x, int y, Color) = 0;
 
-       /// draw a filled rectangle with the shape of a 3D button
-       virtual void button(int x, int y, int w, int h, bool mouseHover) = 0;
-
        /// draw an image from the image cache
        virtual void image(int x, int y, int w, int h,
                graphics::Image const & image) = 0;
@@ -150,15 +147,12 @@ public:
                          Color other, size_type from, size_type to,
                       double wordspacing, double textwidth) = 0;
 
-       void setDrawingEnabled(bool drawing_enabled)
-       { drawing_enabled_ = drawing_enabled; }
-
-       /// Indicate wether real screen drawing shall be done or not.
-       bool isDrawingEnabled() const { return drawing_enabled_; }
+       // Returns true if the painter does not actually paint.
+       virtual bool isNull() const = 0;
 
        double pixelRatio() const { return pixel_ratio_; }
 
-       /// draw the underbar, strikeout, uuline and uwave font attributes
+       /// draw the underbar, strikeout, xout, uuline and uwave font attributes
        virtual void textDecoration(FontInfo const & f, int x, int y, int width) = 0;
 
        /**
@@ -172,22 +166,20 @@ public:
 
        /// draw a string and enclose it inside a button frame
        virtual void buttonText(int x, int baseline, docstring const & s,
-               FontInfo const & font, bool mouseHover) = 0;
+               FontInfo const & font, Color back, Color frame, int offset) = 0;
 
        /// draw a character of a preedit string for cjk support.
        virtual int preeditText(int x, int y,
                char_type c, FontInfo const & f, preedit_style style) = 0;
 
        /// 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) = 0;
        /// leave monochrome painting mode
        virtual void leaveMonochromeMode() = 0;
        /// draws a wavy line that can be used for underlining.
        virtual void wavyHorizontalLine(int x, int y, int width, ColorCode col) = 0;
 private:
-       ///
-       bool drawing_enabled_;
        /// Ratio between physical pixels and device-independent pixels
        double pixel_ratio_;
 };