CoordBranch merge

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

diff --git a/src/frontends/Painter.C b/src/frontends/Painter.C
index 323cc0e715f7a7a3a8426a240df1eb6c4701e5e3..6650722fcacb2ff2557c9a87d7ff5a4d19cb9f33 100644 (file)
--- a/src/frontends/Painter.C
+++ b/src/frontends/Painter.C
@@ -41,20 +41,20 @@ void Painter::buttonFrame(int x, int y, int w, int h)
        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;
+       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;
+       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);
 }
 
 
-void Painter::rectText(int x, int baseline,
+void Painter::rectText(int x, int y,
        string const & str,
        LyXFont const & font,
        LColor_color back,
@@ -66,22 +66,18 @@ void 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);
+       text(x + 3, y, str, font);
 }
 
 
-void Painter::buttonText(int x, int baseline,
-       string const & str,
-       LyXFont const & font)
+void Painter::buttonText(int x, int y, string const & str, LyXFont const & font)
 {
        int width;
        int ascent;
@@ -89,8 +85,8 @@ void 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);
+       button(x, y - ascent, width, descent + ascent);
+       text(x + 4, y, str, font);
 }
 
 
@@ -99,10 +95,8 @@ 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());
 }