#include "QLPainter.h"
#include "GuiApplication.h"
-#include "GuiWorkArea.h"
+#include "GuiFontMetrics.h"
#include "QLImage.h"
-#include "FontLoader.h"
#include "GuiApplication.h"
#include "qt_helpers.h"
#include "language.h"
#include "LColor.h"
-#include "frontends/FontMetrics.h"
-
#include "support/unicode.h"
-#include <QPainter>
-#include <QPicture>
-#include <QPixmap>
-#include <QImage>
-
-using lyx::char_type;
-using lyx::docstring;
+#include <QWidget>
using std::endl;
using std::string;
namespace lyx {
namespace frontend {
-QLPainter::~QLPainter()
-{
-}
-
-
-QLPainter::QLPainter(GuiWorkArea * qwa)
- : Painter(), qwa_(qwa)
+QLPainter::QLPainter(QWidget * qwa)
+ : qwa_(qwa)
{
-}
-
-
-void QLPainter::start()
-{
- qp_.reset(new QPainter(qwa_->paintDevice()));
+ //lyxerr << "QLPainter::start()" << endl;
+ QPainter::begin(qwa_);
+ setRenderHint(QPainter::TextAntialiasing);
// new QPainter has default QPen:
current_color_ = LColor::black;
current_ls_ = line_solid;
}
-void QLPainter::end()
-{
- qp_->end();
-}
-
-
-int QLPainter::paperWidth() const
+QLPainter::~QLPainter()
{
- return qwa_->viewport()->width();
+ QPainter::end();
+ //lyxerr << "QLPainter::end()" << endl;
}
-int QLPainter::paperHeight() const
-{
- return qwa_->viewport()->height();
-}
-
void QLPainter::setQPainterPen(LColor_color col,
Painter::line_style ls, Painter::line_width lw)
{
current_ls_ = ls;
current_lw_ = lw;
- QPen pen = qp_.get()->pen();
+ QPen pen = QPainter::pen();
pen.setColor(guiApp->colorCache().get(col));
case line_thick: pen.setWidth(3); break;
}
- qp_.get()->setPen(pen);
+ setPen(pen);
}
void QLPainter::point(int x, int y, LColor_color col)
{
+ if (!isDrawingEnabled())
+ return;
+
setQPainterPen(col);
- qp_->drawPoint(x, y);
+ drawPoint(x, y);
}
line_style ls,
line_width lw)
{
+ if (!isDrawingEnabled())
+ return;
+
setQPainterPen(col, ls, lw);
- qp_->drawLine(x1, y1, x2, y2);
+ drawLine(x1, y1, x2, y2);
}
points[i].setY(yp[i]);
}
+ if (!isDrawingEnabled())
+ return;
+
setQPainterPen(col, ls, lw);
- qp_->drawPolyline(points.get(), np);
+ drawPolyline(points.get(), np);
}
line_style ls,
line_width lw)
{
+ if (!isDrawingEnabled())
+ return;
+
setQPainterPen(col, ls, lw);
- qp_->drawRect(x, y, w, h);
+ drawRect(x, y, w, h);
}
void QLPainter::fillRectangle(int x, int y, int w, int h, LColor_color col)
{
- qp_->fillRect(x, y, w, h, guiApp->colorCache().get(col));
+ fillRect(x, y, w, h, guiApp->colorCache().get(col));
}
void QLPainter::arc(int x, int y, unsigned int w, unsigned int h,
int a1, int a2, LColor_color col)
{
+ if (!isDrawingEnabled())
+ return;
+
// LyX usings 1/64ths degree, Qt usings 1/16th
setQPainterPen(col);
- qp_->drawArc(x, y, w, h, a1 / 4, a2 / 4);
+ drawArc(x, y, w, h, a1 / 4, a2 / 4);
}
-void QLPainter::image(int x, int y, int w, int h,
- lyx::graphics::Image const & i)
+void QLPainter::image(int x, int y, int w, int h, graphics::Image const & i)
{
- lyx::graphics::QLImage const & qlimage =
- static_cast<lyx::graphics::QLImage const &>(i);
+ graphics::QLImage const & qlimage =
+ static_cast<graphics::QLImage const &>(i);
fillRectangle(x, y, w, h, LColor::graphicsbg);
- qp_->drawImage(x, y, qlimage.qimage(), 0, 0, w, h);
+ if (!isDrawingEnabled())
+ return;
+
+ drawImage(x, y, qlimage.qimage(), 0, 0, w, h);
}
int QLPainter::text(int x, int y, docstring const & s, LyXFont const & f)
{
- return text(x, y, reinterpret_cast<char_type const *>(s.data()), s.length(), f);
+ return text(x, y, reinterpret_cast<char_type const *>(s.data()), s.length(), f);
}
setQPainterPen(f.realColor());
int textwidth = 0;
- size_t ls = s.length();
+ size_t const ls = s.length();
for (unsigned int i = 0; i < ls; ++i) {
QChar const c = s[i].toUpper();
if (c != s.at(i)) {
- qp_->setFont(qsmallfont);
+ setFont(qsmallfont);
} else {
- qp_->setFont(qfont);
+ setFont(qfont);
}
- qp_->drawText(x + textwidth, y, c);
- textwidth += qp_->fontMetrics().width(c);
+ if (isDrawingEnabled())
+ drawText(x + textwidth, y, c);
+ textwidth += fontMetrics().width(c);
}
return textwidth;
}
if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
setQPainterPen(f.realColor());
- qp_->setFont(fi.font);
+ if (font() != fi.font)
+ setFont(fi.font);
// We need to draw the text as LTR as we use our own bidi code.
- qp_->setLayoutDirection(Qt::LeftToRight);
- qp_->drawText(x, y, str);
- textwidth = qp_->fontMetrics().width(str);
+ setLayoutDirection(Qt::LeftToRight);
+ if (isDrawingEnabled())
+ drawText(x, y, str);
+ // Here we use the font width cache instead of
+ // textwidth = fontMetrics().width(str);
+ // because the above is awfully expensive on MacOSX
+ textwidth = fi.metrics->width(str);
} else {
textwidth = smallCapsText(x, y, str, f);
}
}
-void QLPainter::drawPixmap(int x, int y, QPixmap const & pixmap)
-{
- qp_->drawPixmap(x, y, pixmap);
-}
-
-
-void QLPainter::drawImage(int x, int y, QImage const & image)
-{
- qp_->drawImage(x, y, image);
-}
-
} // namespace frontend
} // namespace lyx