namespace lyx {
namespace frontend {
+
+const float Painter::thin_line = 0.0;
GuiPainter::GuiPainter(QPaintDevice * device)
: QPainter(device), Painter(),
// new QPainter has default QPen:
current_color_ = guiApp->colorCache().get(Color_black);
current_ls_ = line_solid;
- current_lw_ = line_thin;
+ current_lw_ = thin_line;
}
void GuiPainter::setQPainterPen(QColor const & col,
- Painter::line_style ls, Painter::line_width lw)
+ Painter::line_style ls, float lw)
{
if (col == current_color_ && ls == current_ls_ && lw == current_lw_)
return;
case line_onoffdash: pen.setStyle(Qt::DotLine); break;
}
- switch (lw) {
- case line_thin: pen.setWidth(0); break;
- case line_thick: pen.setWidth(3); break;
- }
+ pen.setWidthF(lw);
setPen(pen);
}
void GuiPainter::line(int x1, int y1, int x2, int y2,
Color col,
line_style ls,
- line_width lw)
+ float lw)
{
if (!isDrawingEnabled())
return;
void GuiPainter::lines(int const * xp, int const * yp, int np,
Color col,
line_style ls,
- line_width lw)
+ float lw)
{
if (!isDrawingEnabled())
return;
void GuiPainter::rectangle(int x, int y, int w, int h,
Color col,
line_style ls,
- line_width lw)
+ float lw)
{
if (!isDrawingEnabled())
return;
void GuiPainter::wavyHorizontalLine(int x, int y, int width, ColorCode col)
{
setQPainterPen(computeColor(col));
- int const step = 4;
+ int const step = 2;
int const xend = x + width;
int height = 1;
//FIXME: I am not sure if Antialiasing gives the best effect.
height = - height;
drawLine(x, y - height, x + step, y + height);
x += step;
- drawLine(x, y + height, x + 2, y + height);
- x += 2;
+ drawLine(x, y + height, x + step/2, y + height);
+ x += step/2;
}
//setRenderHint(Antialiasing, false);
}