*
* LyX, The Document Processor
*
- * Copyright 1998-2000 The LyX Team
+ * Copyright 1998-2001 The LyX Team
*
*======================================================*/
string const & str,
LyXFont const & font,
LColor::color back,
- LColor::color frame, bool draw,
- int & width, int & ascent, int & descent)
+ LColor::color frame)
{
- static int const d = 2;
- width = lyxfont::width(str, font) + d * 2 + 2;
- ascent = lyxfont::maxAscent(font) + d;
- descent = lyxfont::maxDescent(font) + d;
-
- if (!draw) return *this;
-
+ int width;
+ int ascent;
+ int descent;
+
+ lyxfont::rectText(str, font, width, ascent, descent);
rectangle(x, baseline - ascent, width, ascent + descent, frame);
fillRectangle(x + 1, baseline - ascent + 1, width - 1,
ascent + descent - 1, back);
- text(x + d, baseline, str, font);
+ text(x + 3, baseline, str, font);
return *this;
}
PainterBase & PainterBase::buttonText(int x, int baseline,
string const & str,
- LyXFont const & font, bool draw,
- int & width, int & ascent, int & descent)
+ LyXFont const & font)
{
- width = lyxfont::width(str, font) + 8;
- ascent = lyxfont::maxAscent(font) + 3;
- descent = lyxfont::maxDescent(font) + 3;
-
- if (!draw) return *this;
-
+ int width;
+ int ascent;
+ int descent;
+
+ lyxfont::buttonText(str, font, width, ascent, descent);
button(x, baseline - ascent, width, descent + ascent);
text(x + 4, baseline, str, font);
return *this;