Fix Qt4 resize bug.

[lyx.git] / src / frontends / qt4 / QLPainter.C

diff --git a/src/frontends/qt4/QLPainter.C b/src/frontends/qt4/QLPainter.C
index 877f07fde989a09183a9f2962ab075719edb0256..7293cb0be8b69902666cde2f0a078543d967af60 100644 (file)
--- a/src/frontends/qt4/QLPainter.C
+++ b/src/frontends/qt4/QLPainter.C
@@ -39,21 +39,10 @@ QLPainter::~QLPainter()
 }
 
 QLPainter::QLPainter(QWorkArea * qwa)
-       : Painter(), paint_check_(0), qwa_(qwa)
+       : Painter(), qwa_(qwa)
 {
 }
 
-void QLPainter::start()
-{
-}
-
-
-void QLPainter::end()
-{
-//     if (qp_->isActive())
-//             qp_->end();
-}
-
 
 int QLPainter::paperWidth() const
 {
@@ -66,35 +55,19 @@ int QLPainter::paperHeight() const
        return qwa_->viewport()->height();
 }
 
-/*
-QPainter & QLPainter::setPen(LColor_color c,
+void QLPainter::setQPainterPen(QPainter & qp, LColor_color col,
        Painter::line_style ls, Painter::line_width lw)
 {
-       QPen pen = qp_->pen();
-
-       pen.setColor(lcolorcache.get(c));
-
-       switch (ls) {
-               case line_solid: pen.setStyle(Qt::SolidLine); break;
-               case line_onoffdash: pen.setStyle(Qt::DotLine); break;
-       }
-
-       switch (lw) {
-               case line_thin: pen.setWidth(0); break;
-               case line_thick: pen.setWidth(3); break;
-       }
+       if (col == current_color_ && ls == current_ls_ && lw == current_lw_)
+               return;
 
-       qp_->setPen(pen);
+       current_color_ = col;
+       current_ls_ = ls;
+       current_lw_ = lw;
 
-       return *qp_;
-}
-*/
-QPainter & QLPainter::setQPainterPen(QPainter & qp, LColor_color c,
-       Painter::line_style ls, Painter::line_width lw)
-{
        QPen pen = qp.pen();
 
-       pen.setColor(lcolorcache.get(c));
+       pen.setColor(lcolorcache.get(col));
 
        switch (ls) {
                case line_solid: pen.setStyle(Qt::SolidLine); break;
@@ -107,14 +80,13 @@ QPainter & QLPainter::setQPainterPen(QPainter & qp, LColor_color c,
        }
 
        qp.setPen(pen);
-
-       return qp;
 }
 
-void QLPainter::point(int x, int y, LColor_color c)
+void QLPainter::point(int x, int y, LColor_color col)
 {
-       QPainter qp(qwa_->pixmap());
-       setQPainterPen(qp, c).drawPoint(x, y);
+       QPainter qp(qwa_->paintDevice());
+       setQPainterPen(qp, col);
+       qp.drawPoint(x, y);
 }
 
 
@@ -123,8 +95,9 @@ void QLPainter::line(int x1, int y1, int x2, int y2,
        line_style ls,
        line_width lw)
 {
-       QPainter qp(qwa_->pixmap());
-       setQPainterPen(qp, col, ls, lw).drawLine(x1, y1, x2, y2);
+       QPainter qp(qwa_->paintDevice());
+       setQPainterPen(qp, col, ls, lw);
+       qp.drawLine(x1, y1, x2, y2);
 }
 
 
@@ -143,8 +116,9 @@ void QLPainter::lines(int const * xp, int const * yp, int np,
                points[i].setY(yp[i]);
        }
 
-       QPainter qp(qwa_->pixmap());
-       setQPainterPen(qp, col, ls, lw).drawPolyline(points.get(), np);
+       QPainter qp(qwa_->paintDevice());
+       setQPainterPen(qp, col, ls, lw);
+       qp.drawPolyline(points.get(), np);
 }
 
 
@@ -153,18 +127,15 @@ void QLPainter::rectangle(int x, int y, int w, int h,
        line_style ls,
        line_width lw)
 {
-       QPainter qp(qwa_->pixmap());
-       setQPainterPen(qp, col, ls, lw).drawRect(x, y, w, h);
+       QPainter qp(qwa_->paintDevice());
+       setQPainterPen(qp, col, ls, lw);
+       qp.drawRect(x, y, w, h);
 }
 
 
 void QLPainter::fillRectangle(int x, int y, int w, int h, LColor_color col)
 {
-//     lyxerr[Debug::GRAPHICS] << BOOST_CURRENT_FUNCTION
-//             << "\nx=" << x << " y=" << y << " w=" << w << " h=" << h
-//             << " LColor " << col << endl;
-
-       QPainter qp(qwa_->pixmap());
+       QPainter qp(qwa_->paintDevice());
        qp.fillRect(x, y, w, h, lcolorcache.get(col));
 }
 
@@ -180,7 +151,7 @@ void QLPainter::fillPolygon(int const * xp, int const * yp,
                points[i].setY(yp[i]);
        }
 
-       QPainter qp(qwa_->pixmap());
+       QPainter qp(qwa_->paintDevice());
        setQPainterPen(qp, col);
        qp.setBrush(lcolorcache.get(col));
        qp.drawPolygon(points.get(), np);
@@ -192,8 +163,9 @@ void QLPainter::arc(int x, int y, unsigned int w, unsigned int h,
        int a1, int a2, LColor_color col)
 {
        // LyX usings 1/64ths degree, Qt usings 1/16th
-       QPainter qp(qwa_->pixmap());
-       setQPainterPen(qp, col).drawArc(x, y, w, h, a1 / 4, a2 / 4);
+       QPainter qp(qwa_->paintDevice());
+       setQPainterPen(qp, col);
+       qp.drawArc(x, y, w, h, a1 / 4, a2 / 4);
 }
 
 
@@ -205,7 +177,7 @@ void QLPainter::image(int x, int y, int w, int h,
 
        fillRectangle(x, y, w, h, LColor::graphicsbg);
 
-       QPainter qp(qwa_->pixmap());
+       QPainter qp(qwa_->paintDevice());
        qp.drawImage(x, y, qlimage.qimage(), 0, 0, w, h);
 }
 
@@ -234,12 +206,12 @@ void QLPainter::smallCapsText(int x, int y,
        QFontMetrics const & qfontm = QFontMetrics(qfont);
        QFontMetrics const & qsmallfontm = QFontMetrics(qsmallfont);
 
-       QPainter qp(qwa_->pixmap());
+       QPainter qp(qwa_->paintDevice());
+       setQPainterPen(qp, f.realColor());
        int tmpx = x;
        size_t ls = s.length();
        for (size_t i = 0; i < ls; ++i) {
-               // Brain-dead MSVC wants at(i) rather than operator[]
-               QChar const c = s.at(i).upper();
+               QChar const c = s[i].upper();
                if (c != s.at(i)) {
                        qp.setFont(qsmallfont);
                        qp.drawText(tmpx, y, c);
@@ -256,9 +228,6 @@ void QLPainter::smallCapsText(int x, int y,
 void QLPainter::text(int x, int y, char const * s, size_t ls,
        LyXFont const & f)
 {
-       QPainter qp(qwa_->pixmap());
-       setQPainterPen(qp, f.realColor());
-
        Encoding const * encoding = f.language()->encoding();
        if (f.isSymbolFont())
                encoding = encodings.symbol_encoding();
@@ -266,16 +235,18 @@ void QLPainter::text(int x, int y, char const * s, size_t ls,
        QString str;
        str.setLength(ls);
        for (int i = 0; i < ls; ++i)
-               // Brain-dead MSVC wants at(i) rather than operator[]
                str[i] = QChar(encoding->ucs(s[i]));
+
        // 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;
 
        if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
+               QPainter qp(qwa_->paintDevice());
+               setQPainterPen(qp, f.realColor());
                qp.setFont(fontloader.get(f));
-               // We need to draw the text as LTR as we use our own bidi
-               // code.
+               // We need to draw the text as LTR as we use our own bidi code.
                qp.setLayoutDirection(Qt::LeftToRight);
                qp.drawText(x, y, str, -1);
        } else {
@@ -288,8 +259,14 @@ void QLPainter::text(int x, int y, char const * s, size_t ls,
 
 }
 /// draw a pixmap from the image cache
-void QLPainter::pixmap(int x, int y, QPixmap const & pixmap)
+void QLPainter::drawPixmap(int x, int y, QPixmap const & pixmap)
 {
-       QPainter qp(qwa_->pixmap());
+       QPainter qp(qwa_->paintDevice());
        qp.drawPixmap(x, y, pixmap);
 }
+
+void QLPainter::drawImage(int x, int y, QImage const & image)
+{
+       QPainter qp(qwa_->paintDevice());
+       qp.drawImage(x, y, image);
+}