enable Font cache only for MacOSX and inline width() for other platform.

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

diff --git a/src/frontends/Painter.C b/src/frontends/Painter.C
index 79f97bf8e83721486d61f0793a8d25202c36204e..757d85188620169e1672a0dd8bd5b3b36be5bd43 100644 (file)
--- a/src/frontends/Painter.C
+++ b/src/frontends/Painter.C
@@ -13,51 +13,44 @@
 
 #include "Painter.h"
 #include "font_metrics.h"
-#include "WorkArea.h"
 
 #include "LColor.h"
 #include "lyxfont.h"
 
+using lyx::docstring;
+
 using std::max;
+using std::string;
 
+namespace lyx {
+namespace frontend {
 
-Painter & Painter::button(int x, int y, int w, int h)
+void Painter::button(int x, int y, int w, int h)
 {
        fillRectangle(x, y, w, h, LColor::buttonbg);
        buttonFrame(x, y, w, h);
-       return * this;
 }
 
 
-Painter & Painter::buttonFrame(int x, int y, int w, int h)
+void Painter::buttonFrame(int x, int y, int w, int h)
 {
        //  Width of a side of the button
        int const d = 2;
 
        fillRectangle(x, y, w, d, LColor::top);
-       fillRectangle(x, (y + h - d), w, d, LColor::bottom);
-
-       // Now a couple of trapezoids
-       int x1[4], y1[4];
-
-       x1[0] = x + d;   y1[0] = y + d;
-       x1[1] = x + d;   y1[1] = (y + h - d);
-       x1[2] = x;     y1[2] = y + h;
-       x1[3] = x;     y1[3] = y;
-       fillPolygon(x1, y1, 4, LColor::left);
+       fillRectangle(x, y + h - d, w, d, LColor::bottom);
 
-       x1[0] = (x + w - d); y1[0] = y + d;
-       x1[1] = (x + w - d); y1[1] = (y + h - d);
-       x1[2] = x + w; y1[2] = (y + h - d);
-       x1[3] = x + w; y1[3] = y;
-       fillPolygon(x1, y1, 4, LColor::right);
-
-       return *this;
+       for (int i = 0 ; i < d ; ++i) {
+               line(x + i, y + i,
+                    x + i, y + h - 1 - i, LColor::left);
+               line(x + w - 1 - i, y + i + 1,
+                    x + w - 1 - i, y + h - 1 - i, LColor::right);
+       }
 }
 
 
-Painter & Painter::rectText(int x, int baseline,
-       string const & str,
+void Painter::rectText(int x, int y,
+       docstring const & str,
        LyXFont const & font,
        LColor_color back,
        LColor_color frame)
@@ -68,23 +61,18 @@ Painter & Painter::rectText(int x, int baseline,
 
        font_metrics::rectText(str, font, width, ascent, descent);
 
-       if (back != LColor::none) {
-               fillRectangle(x + 1, baseline - ascent + 1, width - 1,
+       if (back != LColor::none)
+               fillRectangle(x + 1, y - ascent + 1, width - 1,
                              ascent + descent - 1, back);
-       }
 
-       if (frame != LColor::none) {
-               rectangle(x, baseline - ascent, width, ascent + descent, frame);
-       }
+       if (frame != LColor::none)
+               rectangle(x, y - ascent, width, ascent + descent, frame);
 
-       text(x + 3, baseline, str, font);
-       return *this;
+       text(x + 3, y, str, font);
 }
 
 
-Painter & Painter::buttonText(int x, int baseline,
-       string const & str,
-       LyXFont const & font)
+void Painter::buttonText(int x, int y, docstring const & str, LyXFont const & font)
 {
        int width;
        int ascent;
@@ -92,9 +80,8 @@ Painter & Painter::buttonText(int x, int baseline,
 
        font_metrics::buttonText(str, font, width, ascent, descent);
 
-       button(x, baseline - ascent, width, descent + ascent);
-       text(x + 4, baseline, str, font);
-       return *this;
+       button(x, y - ascent, width, descent + ascent);
+       text(x + 4, y, str, font);
 }
 
 
@@ -103,10 +90,11 @@ void Painter::underline(LyXFont const & f, int x, int y, int width)
        int const below = max(font_metrics::maxDescent(f) / 2, 2);
        int const height = max((font_metrics::maxDescent(f) / 4) - 1, 1);
 
-       if (height < 2) {
+       if (height < 2)
                line(x, y + below, x + width, y + below, f.color());
-       } else {
-               fillRectangle(x, y + below, width, below + height,
-                             f.color());
-       }
+       else
+               fillRectangle(x, y + below, width, below + height, f.color());
 }
+
+} // namespace frontend
+} // namespace lyx