X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2FPainter.C;h=6650722fcacb2ff2557c9a87d7ff5a4d19cb9f33;hb=36945644e70db39a8316570bb44fabc7a3bd3d49;hp=6fd9fd166f50083b322053f30263bb699305ecbd;hpb=d6cb58ab663a42b3a8b04e3a3ac40f9e4074ae12;p=lyx.git diff --git a/src/frontends/Painter.C b/src/frontends/Painter.C index 6fd9fd166f..6650722fca 100644 --- a/src/frontends/Painter.C +++ b/src/frontends/Painter.C @@ -13,21 +13,23 @@ #include "Painter.h" #include "font_metrics.h" -#include "lyxfont.h" #include "WorkArea.h" +#include "LColor.h" +#include "lyxfont.h" + using std::max; +using std::string; -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; @@ -39,26 +41,24 @@ Painter & 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); - - return *this; } -Painter & Painter::rectText(int x, int baseline, +void Painter::rectText(int x, int y, string const & str, LyXFont const & font, - LColor::color back, - LColor::color frame) + LColor_color back, + LColor_color frame) { int width; int ascent; @@ -66,23 +66,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, string const & str, LyXFont const & font) { int width; int ascent; @@ -90,9 +85,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); } @@ -101,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()); }