enable Font cache only for MacOSX and inline width() for other platform.

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

diff --git a/src/frontends/qt4/QLPainter.C b/src/frontends/qt4/QLPainter.C
index 8bc90f1d925305ba610079745fbec054c2eb3034..f306ebc330944b6873d35b2859837300030d184e 100644 (file)
--- a/src/frontends/qt4/QLPainter.C
+++ b/src/frontends/qt4/QLPainter.C
@@ -13,12 +13,13 @@
 
 #include "QLPainter.h"
 
+#include "GuiApplication.h"
 #include "GuiWorkArea.h"
 #include "QLImage.h"
-#include "ColorCache.h"
 #include "FontLoader.h"
 
-#include "Application.h"
+#include "GuiApplication.h"
+#include "qt_helpers.h"
 
 #include "debug.h"
 #include "language.h"
@@ -26,11 +27,16 @@
 
 #include "frontends/font_metrics.h"
 
+#include "support/unicode.h"
+
 #include <QPainter>
 #include <QPicture>
 #include <QPixmap>
 #include <QImage>
 
+using lyx::char_type;
+using lyx::docstring;
+
 using std::endl;
 using std::string;
 
@@ -52,7 +58,7 @@ void QLPainter::start()
 {
        qp_.reset(new QPainter(qwa_->paintDevice()));
        // new QPainter has default QPen:
-       current_color_ = LColor::black; 
+       current_color_ = LColor::black;
        current_ls_ = line_solid;
        current_lw_ = line_thin;
 }
@@ -87,7 +93,7 @@ void QLPainter::setQPainterPen(LColor_color col,
 
        QPen pen = qp_.get()->pen();
 
-       pen.setColor(lcolorcache.get(col));
+       pen.setColor(guiApp->colorCache().get(col));
 
        switch (ls) {
                case line_solid: pen.setStyle(Qt::SolidLine); break;
@@ -152,25 +158,7 @@ void QLPainter::rectangle(int x, int y, int w, int 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);
+       qp_->fillRect(x, y, w, h, guiApp->colorCache().get(col));
 }
 
 
@@ -195,15 +183,15 @@ void QLPainter::image(int x, int y, int w, int h,
 }
 
 
-void QLPainter::text(int x, int y, string const & s, LyXFont const & f)
+void 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)
+void 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);
 }
 
@@ -214,8 +202,8 @@ void QLPainter::smallCapsText(int x, int y,
        LyXFont smallfont(f);
        smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
 
-       QFont const & qfont = theApp->fontLoader().get(f);
-       QFont const & qsmallfont = theApp->fontLoader().get(smallfont);
+       QFont const & qfont = guiApp->guiFontLoader().get(f);
+       QFont const & qsmallfont = guiApp->guiFontLoader().get(smallfont);
        QFontMetrics const & qfontm = QFontMetrics(qfont);
        QFontMetrics const & qsmallfontm = QFontMetrics(qsmallfont);
 
@@ -223,7 +211,7 @@ void QLPainter::smallCapsText(int x, int y,
        int tmpx = x;
        size_t 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);
@@ -237,26 +225,34 @@ void QLPainter::smallCapsText(int x, int y,
 }
 
 
-void QLPainter::text(int x, int y, char const * s, size_t ls,
+void 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
 
+#if 0
        QString str;
        str.setLength(ls);
        for (unsigned int i = 0; i < ls; ++i)
                str[i] = QChar(encoding->ucs(s[i]));
+#else
+       QString str = ucs4_to_qstring(s, ls);
+#endif
 
+#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
 
        if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
                setQPainterPen(f.realColor());
-               qp_->setFont(theApp->fontLoader().get(f));
+               qp_->setFont(guiApp->guiFontLoader().get(f));
                // We need to draw the text as LTR as we use our own bidi code.
                qp_->setLayoutDirection(Qt::LeftToRight);
                qp_->drawText(x, y, str);