#include "QLPainter.h"
-#include "GuiWorkArea.h"
+#include "GuiApplication.h"
+#include "GuiFontMetrics.h"
#include "QLImage.h"
-#include "ColorCache.h"
-#include "FontLoader.h"
+#include "GuiApplication.h"
+#include "qt_helpers.h"
+#include "debug.h"
#include "language.h"
#include "LColor.h"
-#include "frontends/font_metrics.h"
+#include "support/unicode.h"
-#include <QPainter>
-#include <QPicture>
-#include <QPixmap>
-#include <QImage>
+#include <QWidget>
using std::endl;
using std::string;
namespace lyx {
namespace frontend {
-QLPainter::~QLPainter()
+QLPainter::QLPainter(QWidget * qwa)
+ : qwa_(qwa)
{
-}
-
-
-QLPainter::QLPainter(GuiWorkArea * qwa)
- : Painter(), 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_color_ = LColor::black;
current_ls_ = line_solid;
current_lw_ = line_thin;
}
-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(lcolorcache.get(col));
+ pen.setColor(guiApp->colorCache().get(col));
switch (ls) {
case line_solid: pen.setStyle(Qt::SolidLine); break;
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, lcolorcache.get(col));
-}
-
-
-void QLPainter::fillPolygon(int const * xp, int const * yp,
- int np, LColor_color col)
-{
- // Must use new as np is not known at compile time.
- boost::scoped_array<QPoint> points(new QPoint[np]);
-
- for (int i = 0; i < np; ++i) {
- points[i].setX(xp[i]);
- points[i].setY(yp[i]);
- }
-
- setQPainterPen(col);
- qp_->setBrush(lcolorcache.get(col));
- qp_->drawPolygon(points.get(), np);
- qp_->setBrush(Qt::NoBrush);
+ 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);
}
-void QLPainter::text(int x, int y, string const & s, LyXFont const & f)
+int QLPainter::text(int x, int y, docstring const & s, LyXFont const & f)
{
- return text(x, y, s.data(), s.length(), f);
+ return text(x, y, reinterpret_cast<char_type const *>(s.data()), s.length(), f);
}
-void QLPainter::text(int x, int y, char c, LyXFont const & f)
+int QLPainter::text(int x, int y, char_type c, LyXFont const & f)
{
- char s[2] = { c, '\0' };
+ char_type s[2] = { c, char_type('\0') };
return text(x, y, s, 1, f);
}
-void QLPainter::smallCapsText(int x, int y,
+int QLPainter::smallCapsText(int x, int y,
QString const & s, LyXFont const & f)
{
LyXFont smallfont(f);
smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
- QFont const & qfont = fontloader.get(f);
- QFont const & qsmallfont = fontloader.get(smallfont);
- QFontMetrics const & qfontm = QFontMetrics(qfont);
- QFontMetrics const & qsmallfontm = QFontMetrics(qsmallfont);
+ QFont const & qfont = guiApp->guiFontLoader().get(f);
+ QFont const & qsmallfont = guiApp->guiFontLoader().get(smallfont);
setQPainterPen(f.realColor());
- int tmpx = x;
- size_t ls = s.length();
+ int textwidth = 0;
+ size_t const ls = s.length();
for (unsigned int i = 0; i < ls; ++i) {
- QChar const c = s[i].upper();
+ QChar const c = s[i].toUpper();
if (c != s.at(i)) {
- qp_->setFont(qsmallfont);
- qp_->drawText(tmpx, y, c);
- tmpx += qsmallfontm.width(c);
+ setFont(qsmallfont);
} else {
- qp_->setFont(qfont);
- qp_->drawText(tmpx, y, c);
- tmpx += qfontm.width(c);
+ setFont(qfont);
}
+ if (isDrawingEnabled())
+ drawText(x + textwidth, y, c);
+ textwidth += fontMetrics().width(c);
}
+ return textwidth;
}
-void QLPainter::text(int x, int y, char const * s, size_t ls,
+int QLPainter::text(int x, int y, char_type const * s, size_t ls,
LyXFont const & f)
{
+#if 0
Encoding const * encoding = f.language()->encoding();
if (f.isSymbolFont())
encoding = encodings.symbol_encoding();
+#endif
QString str;
- str.setLength(ls);
- for (unsigned int i = 0; i < ls; ++i)
- str[i] = QChar(encoding->ucs(s[i]));
+ ucs4_to_qstring(s, ls, str);
+#if 0
// HACK: QT3 refuses to show single compose characters
// Still needed with Qt4?
if (ls == 1 && str[0].unicode() >= 0x05b0 && str[0].unicode() <= 0x05c2)
str = ' ' + str;
+#endif
+
+ QLFontInfo & fi = guiApp->guiFontLoader().fontinfo(f);
+
+ int textwidth;
if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
setQPainterPen(f.realColor());
- qp_->setFont(fontloader.get(f));
+ 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);
+ 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 {
- smallCapsText(x, y, str, f);
+ textwidth = smallCapsText(x, y, str, f);
}
if (f.underbar() == LyXFont::ON) {
- underline(f, x, y, font_metrics::width(s, ls, f));
+ underline(f, x, y, textwidth);
}
+ return textwidth;
}
-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
projects / lyx.git / blobdiff