#include "WorkArea.h"
#include "font.h"
-int PainterBase::dummy1 = 0;
-int PainterBase::dummy2 = 0;
-int PainterBase::dummy3 = 0;
int PainterBase::paperMargin() const
{
{
// Width of a side of the button
int 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[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;
+ 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;
}
-#if 0
-PainterBase & PainterBase::rectText(int x, int baseline,
- string const & str,
- LyXFont const & font,
- LColor::color back,
- LColor::color frame, bool draw,
- int & width, int & ascent, int & descent)
-{
-#if 0
- static int const d = 2;
- width = lyxfont::width(str, font) + d * 2 + 2;
- ascent = lyxfont::maxAscent(font) + d;
- descent = lyxfont::maxDescent(font) + d;
-#else
- lyxfont::rectText(str, font, width, axcent, descent);
-#endif
- if (!draw) return *this;
-
- rectangle(x, baseline - ascent, width, ascent + descent, frame);
- fillRectangle(x + 1, baseline - ascent + 1, width - 1,
- ascent + descent - 1, back);
-#if 0
- text(x + d, baseline, str, font);
-#else
- text(x + 2, baseline, str, font);
-#endif
- return *this;
-}
-
-
-PainterBase & PainterBase::buttonText(int x, int baseline,
- string const & str,
- LyXFont const & font, bool draw,
- int & width, int & ascent, int & descent)
-{
-#if 0
- width = lyxfont::width(str, font) + 8;
- ascent = lyxfont::maxAscent(font) + 3;
- descent = lyxfont::maxDescent(font) + 3;
-#else
- lyxfont::buttonText(str, font, width, ascent, descent);
-#endif
- if (!draw) return *this;
-
- button(x, baseline - ascent, width, descent + ascent);
- text(x + 4, baseline, str, font);
- return *this;
-}
-#else
PainterBase & PainterBase::rectText(int x, int baseline,
string const & str,
LyXFont const & font,
rectangle(x, baseline - ascent, width, ascent + descent, frame);
fillRectangle(x + 1, baseline - ascent + 1, width - 1,
ascent + descent - 1, back);
- text(x + 2, baseline, str, font);
+ text(x + 3, baseline, str, font);
return *this;
}
text(x + 4, baseline, str, font);
return *this;
}
-#endif