Document pasteParagraphList as hinted by Jean-Marc

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

diff --git a/src/frontends/Painter.C b/src/frontends/Painter.C
index 6650722fcacb2ff2557c9a87d7ff5a4d19cb9f33..25f8edf2beb6ee5905c6b615a4b5efb89d8c8309 100644 (file)
--- a/src/frontends/Painter.C
+++ b/src/frontends/Painter.C
@@ -11,16 +11,20 @@
 
 #include <config.h>
 
-#include "Painter.h"
-#include "font_metrics.h"
-#include "WorkArea.h"
+#include "frontends/Painter.h"
+
+#include "frontends/FontMetrics.h"
 
 #include "LColor.h"
 #include "lyxfont.h"
 
+using lyx::docstring;
+
 using std::max;
 using std::string;
 
+namespace lyx {
+namespace frontend {
 
 void Painter::button(int x, int y, int w, int h)
 {
@@ -35,27 +39,19 @@ void Painter::buttonFrame(int x, int y, int w, int h)
        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);
-
-       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);
+       fillRectangle(x, y + h - d, w, d, LColor::bottom);
+
+       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);
+       }
 }
 
 
 void Painter::rectText(int x, int y,
-       string const & str,
+       docstring const & str,
        LyXFont const & font,
        LColor_color back,
        LColor_color frame)
@@ -64,7 +60,8 @@ void Painter::rectText(int x, int y,
        int ascent;
        int descent;
 
-       font_metrics::rectText(str, font, width, ascent, descent);
+       FontMetrics const & fm = theFontMetrics(font);
+       fm.rectText(str, width, ascent, descent);
 
        if (back != LColor::none)
                fillRectangle(x + 1, y - ascent + 1, width - 1,
@@ -77,13 +74,14 @@ void Painter::rectText(int x, int y,
 }
 
 
-void Painter::buttonText(int x, int y, string const & str, LyXFont const & font)
+void Painter::buttonText(int x, int y, docstring const & str, LyXFont const & font)
 {
        int width;
        int ascent;
        int descent;
 
-       font_metrics::buttonText(str, font, width, ascent, descent);
+       FontMetrics const & fm = theFontMetrics(font);
+       fm.buttonText(str, width, ascent, descent);
 
        button(x, y - ascent, width, descent + ascent);
        text(x + 4, y, str, font);
@@ -92,11 +90,16 @@ void Painter::buttonText(int x, int y, string const & str, LyXFont const & font)
 
 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);
+       FontMetrics const & fm = theFontMetrics(f);
+
+       int const below = max(fm.maxDescent() / 2, 2);
+       int const height = max((fm.maxDescent() / 4) - 1, 1);
 
        if (height < 2)
                line(x, y + below, x + width, y + below, f.color());
        else
                fillRectangle(x, y + below, width, below + height, f.color());
 }
+
+} // namespace frontend
+} // namespace lyx