X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2FPainter.C;h=860655b80ad5ad2d1754851bbadae3b493ea225c;hb=c5058bffd88b5eb000ffd11d5729fbec0f34fb0f;hp=ec555e96242bc9eda6fa39f2d7656f3aeb06d724;hpb=b2e770a640a70c911c38637d4c85715c67836af6;p=lyx.git diff --git a/src/frontends/Painter.C b/src/frontends/Painter.C index ec555e9624..860655b80a 100644 --- a/src/frontends/Painter.C +++ b/src/frontends/Painter.C @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author unknown - * \author John Levon + * \author John Levon * * Full author contact details are available in file CREDITS */ @@ -19,9 +19,9 @@ #include "lyxfont.h" #include "WorkArea.h" #include "frontends/font_metrics.h" - + using std::max; - + Painter & Painter::button(int x, int y, int w, int h) { fillRectangle(x, y, w, h, LColor::buttonbg); @@ -37,10 +37,10 @@ Painter & Painter::buttonFrame(int x, int y, int w, int h) 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; @@ -57,8 +57,8 @@ Painter & Painter::buttonFrame(int x, int y, int w, int h) } -Painter & Painter::rectText(int x, int baseline, - string const & str, +Painter & Painter::rectText(int x, int baseline, + string const & str, LyXFont const & font, LColor::color back, LColor::color frame) @@ -68,23 +68,23 @@ Painter & Painter::rectText(int x, int baseline, int descent; font_metrics::rectText(str, font, width, ascent, descent); - + if (back != LColor::none) { - fillRectangle(x + 1, baseline - ascent + 1, width - 1, + fillRectangle(x + 1, baseline - ascent + 1, width - 1, ascent + descent - 1, back); } - + if (frame != LColor::none) { rectangle(x, baseline - ascent, width, ascent + descent, frame); } - + text(x + 3, baseline, str, font); return *this; } Painter & Painter::buttonText(int x, int baseline, - string const & str, + string const & str, LyXFont const & font) { int width; @@ -92,7 +92,7 @@ Painter & Painter::buttonText(int x, int baseline, int descent; font_metrics::buttonText(str, font, width, ascent, descent); - + button(x, baseline - ascent, width, descent + ascent); text(x + 4, baseline, str, font); return *this; @@ -103,7 +103,7 @@ 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) { line(x, y + below, x + width, y + below, f.color()); } else {