X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FQLPainter.C;h=da811712fe696b3af7dec4e63e76aa6660a3e5b0;hb=73ed0b5203ffefa9a4c2ad8e8cf54396a6e72a9c;hp=ca6aebcbb38b2a4b779f6335fe8f65792387dda0;hpb=28ad9602557a145bfd88c79dddecdc34c95c698c;p=lyx.git diff --git a/src/frontends/qt4/QLPainter.C b/src/frontends/qt4/QLPainter.C index ca6aebcbb3..da811712fe 100644 --- a/src/frontends/qt4/QLPainter.C +++ b/src/frontends/qt4/QLPainter.C @@ -14,7 +14,7 @@ #include "QLPainter.h" #include "GuiApplication.h" -#include "GuiWorkArea.h" +#include "GuiFontMetrics.h" #include "QLImage.h" #include "GuiApplication.h" @@ -24,17 +24,9 @@ #include "language.h" #include "LColor.h" -#include "frontends/FontMetrics.h" - #include "support/unicode.h" -#include -#include -#include -#include - -using lyx::char_type; -using lyx::docstring; +#include using std::endl; using std::string; @@ -42,20 +34,12 @@ 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; @@ -63,23 +47,13 @@ void QLPainter::start() } -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) { @@ -90,7 +64,7 @@ void QLPainter::setQPainterPen(LColor_color col, current_ls_ = ls; current_lw_ = lw; - QPen pen = qp_.get()->pen(); + QPen pen = QPainter::pen(); pen.setColor(guiApp->colorCache().get(col)); @@ -104,14 +78,17 @@ void QLPainter::setQPainterPen(LColor_color 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); } @@ -120,8 +97,11 @@ void QLPainter::line(int x1, int y1, int x2, int y2, line_style ls, line_width lw) { + if (!isDrawingEnabled()) + return; + setQPainterPen(col, ls, lw); - qp_->drawLine(x1, y1, x2, y2); + drawLine(x1, y1, x2, y2); } @@ -140,8 +120,11 @@ void QLPainter::lines(int const * xp, int const * yp, int np, points[i].setY(yp[i]); } + if (!isDrawingEnabled()) + return; + setQPainterPen(col, ls, lw); - qp_->drawPolyline(points.get(), np); + drawPolyline(points.get(), np); } @@ -150,41 +133,49 @@ void QLPainter::rectangle(int x, int y, int w, int h, 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(i); + graphics::QLImage const & qlimage = + static_cast(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(s.data()), s.length(), f); + return text(x, y, reinterpret_cast(s.data()), s.length(), f); } @@ -206,16 +197,17 @@ int QLPainter::smallCapsText(int x, int y, 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; } @@ -246,11 +238,16 @@ int QLPainter::text(int x, int y, char_type const * s, size_t ls, 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); } @@ -263,16 +260,5 @@ int QLPainter::text(int x, int y, char_type const * s, size_t ls, } -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