#include "qt_helpers.h"
#include "Font.h"
-#include "Language.h"
#include "LyXRC.h"
-#include "insets/Inset.h"
-
-#include "support/lassert.h"
#include "support/debug.h"
+#include "support/lassert.h"
+#include "support/lyxlib.h"
-#include <QPixmapCache>
-#include <QTextLayout>
+#include <algorithm>
-// Set USE_PIXMAP_CACHE to 1 for enabling the use of a Pixmap cache when
-// drawing text. This is especially useful for older PPC/Mac systems.
-#if defined(Q_WS_X11) || defined(QPA_XCB)
-#define USE_PIXMAP_CACHE 0
-#else
-#define USE_PIXMAP_CACHE 1
-#endif
+#include <QTextLayout>
using namespace std;
using namespace lyx::support;
namespace lyx {
namespace frontend {
-const int Painter::thin_line = 0;
+const int Painter::thin_line = 1;
GuiPainter::GuiPainter(QPaintDevice * device, double pixel_ratio)
- : QPainter(device), Painter(pixel_ratio),
- use_pixmap_cache_(lyxrc.use_pixmap_cache && USE_PIXMAP_CACHE)
+ : QPainter(device), Painter(pixel_ratio)
{
- // new QPainter has default QPen:
- current_color_ = guiApp->colorCache().get(Color_black);
- current_ls_ = line_solid;
- current_lw_ = thin_line;
+ // set cache correctly
+ current_color_ = pen().color();
+ current_ls_ = pen().style() == Qt::DotLine ? line_onoffdash : line_solid;
+ current_lw_ = pen().width();
}
pen.setColor(col);
switch (ls) {
- case line_solid: pen.setStyle(Qt::SolidLine); break;
- case line_onoffdash: pen.setStyle(Qt::DotLine); break;
+ case line_solid:
+ case line_solid_aliased:
+ pen.setStyle(Qt::SolidLine); break;
+ case line_onoffdash:
+ pen.setStyle(Qt::DotLine); break;
}
pen.setWidth(lw);
}
-QString GuiPainter::generateStringSignature(QString const & str,
- FontInfo const & f,
- double wordspacing)
-{
- QString sig = str;
- sig.append(QChar(static_cast<short>(f.family())));
- sig.append(QChar(static_cast<short>(f.series())));
- sig.append(QChar(static_cast<short>(f.realShape())));
- sig.append(QChar(static_cast<short>(f.size())));
- Color const & color = f.realColor();
- sig.append(QChar(static_cast<short>(color.baseColor)));
- sig.append(QChar(static_cast<short>(color.mergeColor)));
- sig.append(QString::number(wordspacing));
- if (!monochrome_min_.empty()) {
- QColor const & min = monochrome_min_.top();
- QColor const & max = monochrome_max_.top();
- sig.append(QChar(static_cast<short>(min.red())));
- sig.append(QChar(static_cast<short>(min.green())));
- sig.append(QChar(static_cast<short>(min.blue())));
- sig.append(QChar(static_cast<short>(max.red())));
- sig.append(QChar(static_cast<short>(max.green())));
- sig.append(QChar(static_cast<short>(max.blue())));
- }
- return sig;
-}
-
-
QColor GuiPainter::computeColor(Color col)
{
return filterColor(guiApp->colorCache().get(col));
// map into [min,max] interval
QColor const & min = monochrome_min_.top();
QColor const & max = monochrome_max_.top();
-
+
qreal v = col.valueF();
v *= v; // make it a bit steeper (i.e. darker)
-
+
qreal minr, ming, minb;
qreal maxr, maxg, maxb;
min.getRgbF(&minr, &ming, &minb);
max.getRgbF(&maxr, &maxg, &maxb);
-
+
QColor c;
c.setRgbF(
v * (minr - maxr) + maxr,
void GuiPainter::point(int x, int y, Color col)
{
- if (!isDrawingEnabled())
- return;
-
setQPainterPen(computeColor(col));
drawPoint(x, y);
}
line_style ls,
int lw)
{
- if (!isDrawingEnabled())
- return;
-
setQPainterPen(computeColor(col), ls, lw);
bool const do_antialiasing = renderHints() & TextAntialiasing
- && x1 != x2 && y1 != y2;
+ && x1 != x2 && y1 != y2 && ls != line_solid_aliased;
setRenderHint(Antialiasing, do_antialiasing);
drawLine(x1, y1, x2, y2);
setRenderHint(Antialiasing, false);
line_style ls,
int lw)
{
- if (!isDrawingEnabled())
- return;
-
// double the size if needed
// FIXME THREAD
static QVector<QPoint> points(32);
if (np > points.size())
points.resize(2 * np);
+ // Note: the proper way to not get blurry vertical and horizontal lines is
+ // to add 0.5 to all coordinates.
bool antialias = false;
for (int i = 0; i < np; ++i) {
points[i].setX(xp[i]);
QColor const color = computeColor(col);
setQPainterPen(color, ls, lw);
bool const text_is_antialiased = renderHints() & TextAntialiasing;
- setRenderHint(Antialiasing, antialias && text_is_antialiased);
+ setRenderHint(Antialiasing,
+ antialias && text_is_antialiased && ls != line_solid_aliased);
if (fs == fill_none) {
drawPolyline(points.data(), np);
} else {
line_style ls,
int lw)
{
- if (!isDrawingEnabled())
- return;
-
QPainterPath bpath;
// This is the starting point, so its control points are meaningless
bpath.moveTo(xp[0], yp[0]);
QColor const color = computeColor(col);
setQPainterPen(color, ls, lw);
bool const text_is_antialiased = renderHints() & TextAntialiasing;
- setRenderHint(Antialiasing, text_is_antialiased);
+ setRenderHint(Antialiasing, text_is_antialiased && ls != line_solid_aliased);
drawPath(bpath);
if (fs != fill_none)
fillPath(bpath, QBrush(color));
line_style ls,
int lw)
{
- if (!isDrawingEnabled())
- return;
-
setQPainterPen(computeColor(col), ls, lw);
drawRect(x, y, w, h);
}
void GuiPainter::fillRectangle(int x, int y, int w, int h, Color col)
{
- if (!isDrawingEnabled())
- return;
-
fillRect(x, y, w, h, guiApp->colorCache().get(col));
}
void GuiPainter::arc(int x, int y, unsigned int w, unsigned int h,
int a1, int a2, Color col)
{
- if (!isDrawingEnabled())
- return;
-
// LyX usings 1/64ths degree, Qt usings 1/16th
setQPainterPen(computeColor(col));
bool const do_antialiasing = renderHints() & TextAntialiasing;
fillRectangle(x, y, w, h, Color_graphicsbg);
- if (!isDrawingEnabled())
- return;
-
QImage const image = qlimage.image();
QRectF const drect = QRectF(x, y, w, h);
QRectF const srect = QRectF(0, 0, image.width(), image.height());
+ // Bilinear filtering is needed on a rare occasion for instant previews when
+ // the user's configuration mixes low-dpi and high-dpi monitors (#10114).
+ // This filter is optimised by qt on pixel-aligned images, so this does not
+ // affect performances in other cases.
+ setRenderHint(SmoothPixmapTransform);
drawImage(drect, image, srect);
+ setRenderHint(SmoothPixmapTransform, false);
}
-int GuiPainter::text(int x, int y, char_type c, FontInfo const & f)
+void GuiPainter::text(int x, int y, char_type c, FontInfo const & f)
{
- return text(x, y, docstring(1, c), f);
+ text(x, y, docstring(1, c), f);
}
-void GuiPainter::do_drawText(int x, int y, QString str, bool rtl, FontInfo const & f, QFont ff)
+void GuiPainter::text(int x, int y, docstring const & s, FontInfo const & f)
{
- setQPainterPen(computeColor(f.realColor()));
- if (font() != ff)
- setFont(ff);
-
- /* In LyX, the character direction is forced by the language.
- * Therefore, we have to signal that fact to Qt.
- */
-#if 1
- /* Use unicode override characters to enforce drawing direction
- * Source: http://www.iamcal.com/understanding-bidirectional-text/
- */
- if (rtl)
- // Right-to-left override: forces to draw text right-to-left
- str = QChar(0x202E) + str;
- else
- // Left-to-right override: forces to draw text left-to-right
- str = QChar(0x202D) + str;
- drawText(x, y, str);
-#else
- /* This looks like a cleaner solution, but it has drawbacks
- * - does not work reliably (Mac OS X, ...)
- * - it is not really documented
- * Keep it here for now, in case it can be helpful
- */
- //This is much stronger than setLayoutDirection.
- int flag = rtl ? Qt::TextForceRightToLeft : Qt::TextForceLeftToRight;
- drawText(x + (rtl ? textwidth : 0), y - fm.maxAscent(), 0, 0,
- flag | Qt::TextDontClip,
- str);
-#endif
+ text(x, y, s, f, Auto, 0.0, 0.0);
}
-int GuiPainter::text(int x, int y, docstring const & s,
- FontInfo const & f, bool const rtl,
- double const wordspacing)
+void GuiPainter::text(int x, int y, docstring const & s,
+ FontInfo const & f, Direction const dir,
+ double const wordspacing, double const tw)
{
//LYXERR0("text: x=" << x << ", s=" << s);
if (s.empty())
- return 0;
+ return;
/* Caution: The following ucs4 to QString conversions work for symbol fonts
only because they are no real conversions but simple casts in reality.
of the symbol in the font (as given in lib/symbols) as a char_type to the
frontend. This is just wrong, because the symbol is no UCS4 character at
all. You can think of this number as the code point of the symbol in a
- custom symbol encoding. It works because this char_type is lateron again
- interpreted as a position in the font again.
+ custom symbol encoding. It works because this char_type is later on again
+ interpreted as a position in the font.
The correct solution would be to have extra functions for symbols, but that
would require to duplicate a lot of frontend and mathed support code.
*/
ff.setWordSpacing(wordspacing);
GuiFontMetrics const & fm = getFontMetrics(f);
- // Here we use the font width cache instead of
- // textwidth = fontMetrics().width(str);
- // because the above is awfully expensive on MacOSX
- // Note that we have to take in account space stretching (word spacing)
- int const textwidth = fm.width(s) + count(s.begin(), s.end(), ' ') * wordspacing;
-
- if (!isDrawingEnabled())
- return textwidth;
+ int textwidth = 0;
+ if (tw == 0.0)
+ // Take into account space stretching (word spacing)
+ textwidth = fm.width(s) +
+ static_cast<int>(fm.countExpanders(s) * wordspacing);
+ else
+ textwidth = static_cast<int>(tw);
textDecoration(f, x, y, textwidth);
- if (use_pixmap_cache_) {
- QPixmap pm;
- QString key = generateStringSignature(str, f, wordspacing);
-
- // Warning: Left bearing is in general negative! Only the case
- // where left bearing is negative is of interest WRT the
- // pixmap width and the text x-position.
- // Only the left bearing of the first character is important
- // as we always write from left to right, even for
- // right-to-left languages.
- // FIXME: this is probably broken for RTL now that we draw full strings.
- // Morover the first/last element is possibly not the right one since the glyph may have changed.
- int const lb = min(fm.lbearing(s[0]), 0);
- int const mA = fm.maxAscent();
- if (QPixmapCache::find(key, pm)) {
- // Draw the cached pixmap.
- drawPixmap(x + lb, y - mA, pm);
- return textwidth;
- }
-
- // Only the right bearing of the last character is
- // important as we always write from left to right,
- // even for right-to-left languages.
- int const rb = fm.rbearing(s[s.size()-1]);
- int const w = textwidth + rb - lb;
- int const mD = fm.maxDescent();
- int const h = mA + mD;
- if (w > 0 && h > 0) {
- pm = QPixmap(static_cast<int>(pixelRatio() * w),
- static_cast<int>(pixelRatio() * h));
-#if QT_VERSION >= 0x050000
- pm.setDevicePixelRatio(pixelRatio());
-#endif
- pm.fill(Qt::transparent);
- GuiPainter p(&pm, pixelRatio());
- p.do_drawText(-lb, mA, str, rtl, f, ff);
- QPixmapCache::insert(key, pm);
- //LYXERR(Debug::PAINTING, "h=" << h << " mA=" << mA << " mD=" << mD
- // << " w=" << w << " lb=" << lb << " tw=" << textwidth
- // << " rb=" << rb);
-
- // Draw the new cached pixmap.
- drawPixmap(x + lb, y - mA, pm);
- //rectangle(x-lb, y-mA, w, h, Color_green);
- }
- return textwidth;
+ setQPainterPen(computeColor(f.realColor()));
+ if (dir != Auto) {
+ auto ptl = fm.getTextLayout(s, dir == RtL, wordspacing);
+ QTextLine const & tline = ptl->lineForTextPosition(0);
+ ptl->draw(this, QPointF(x, y - tline.ascent()));
+ } else {
+ if (font() != ff)
+ setFont(ff);
+ drawText(x, y, str);
}
-
- // don't use the pixmap cache,
- do_drawText(x, y, str, rtl, f, ff);
//LYXERR(Debug::PAINTING, "draw " << string(str.toUtf8())
// << " at " << x << "," << y);
- return textwidth;
}
-int GuiPainter::text(int x, int y, docstring const & str, Font const & f,
- double const wordspacing)
+void GuiPainter::text(int x, int y, docstring const & str, Font const & f,
+ double const wordspacing, double const tw)
{
- return text(x, y, str, f.fontInfo(), f.isVisibleRightToLeft(), wordspacing);
+ text(x, y, str, f.fontInfo(), f.isVisibleRightToLeft() ? RtL : LtR,
+ wordspacing, tw);
}
-int GuiPainter::text(int x, int y, docstring const & str, Font const & f,
- Color other, size_type const from, size_type const to,
- double const wordspacing)
+void GuiPainter::text(int x, int y, docstring const & str, Font const & f,
+ Color other, size_type const from, size_type const to,
+ double const wordspacing, double const tw)
{
GuiFontMetrics const & fm = getFontMetrics(f.fontInfo());
FontInfo fi = f.fontInfo();
- bool const rtl = f.isVisibleRightToLeft();
+ Direction const dir = f.isVisibleRightToLeft() ? RtL : LtR;
// dimensions
int const ascent = fm.maxAscent();
int const height = fm.maxAscent() + fm.maxDescent();
- int xmin = fm.pos2x(str, from, rtl, wordspacing);
- int xmax = fm.pos2x(str, to, rtl, wordspacing);
- if (xmin > xmax)
+ int xmin = fm.pos2x(str, from, dir == RtL, wordspacing);
+ int xmax = fm.pos2x(str, to, dir == RtL, wordspacing);
+ // Avoid this case, since it would make the `other' text spill in some cases
+ if (xmin == xmax) {
+ text(x, y, str, fi, dir, wordspacing, tw);
+ return;
+ } else if (xmin > xmax)
swap(xmin, xmax);
// First the part in other color
fi.setPaintColor(other);
QRegion const clip(x + xmin, y - ascent, xmax - xmin, height);
setClipRegion(clip);
- int const textwidth = text(x, y, str, fi, rtl, wordspacing);
+ text(x, y, str, fi, dir, wordspacing, tw);
// Then the part in normal color
// Note that in Qt5, it is not possible to use Qt::UniteClip,
fi.setPaintColor(orig);
QRegion region(viewport());
setClipRegion(region - clip);
- text(x, y, str, fi, rtl, wordspacing);
+ text(x, y, str, fi, dir, wordspacing, tw);
setClipping(false);
-
- return textwidth;
}
underline(f, x, y, width);
if (f.strikeout() == FONT_ON)
strikeoutLine(f, x, y, width);
+ if (f.xout() == FONT_ON)
+ crossoutLines(f, x, y, width);
if (f.uuline() == FONT_ON)
doubleUnderline(f, x, y, width);
if (f.uwave() == FONT_ON)
static int max(int a, int b) { return a > b ? a : b; }
-void GuiPainter::button(int x, int y, int w, int h, bool mouseHover)
-{
- if (mouseHover)
- fillRectangle(x, y, w, h, Color_buttonhoverbg);
- else
- fillRectangle(x, y, w, h, Color_buttonbg);
- buttonFrame(x, y, w, h);
-}
-
-
-void GuiPainter::buttonFrame(int x, int y, int w, int h)
-{
- line(x, y, x, y + h - 1, Color_buttonframe);
- line(x - 1 + w, y, x - 1 + w, y + h - 1, Color_buttonframe);
- line(x, y - 1, x - 1 + w, y - 1, Color_buttonframe);
- line(x, y + h - 1, x - 1 + w, y + h - 1, Color_buttonframe);
-}
-
-
void GuiPainter::rectText(int x, int y, docstring const & str,
FontInfo const & font, Color back, Color frame)
{
- int width;
- int ascent;
- int descent;
+ int width, ascent, descent;
FontMetrics const & fm = theFontMetrics(font);
fm.rectText(str, width, ascent, descent);
if (frame != Color_none)
rectangle(x, y - ascent, width, ascent + descent, frame);
+ // FIXME: let offset depend on font
text(x + 3, y, str, font);
}
-void GuiPainter::buttonText(int x, int y, docstring const & str,
- FontInfo const & font, bool mouseHover)
+void GuiPainter::buttonText(int x, int baseline, docstring const & s,
+ FontInfo const & font, Color back, Color frame, int offset)
{
- int width;
- int ascent;
- int descent;
+ int width, ascent, descent;
FontMetrics const & fm = theFontMetrics(font);
- fm.buttonText(str, width, ascent, descent);
+ fm.buttonText(s, offset, width, ascent, descent);
- static int const d = Inset::TEXT_TO_INSET_OFFSET / 2;
+ static int const d = offset / 2;
- button(x + d, y - ascent, width - d, descent + ascent, mouseHover);
- text(x + Inset::TEXT_TO_INSET_OFFSET, y, str, font);
+ fillRectangle(x + d + 1, baseline - ascent + 1, width - offset - 1,
+ ascent + descent - 1, back);
+ rectangle(x + d, baseline - ascent, width - offset, ascent + descent, frame);
+ text(x + offset, baseline, s, font);
}
}
+void GuiPainter::crossoutLines(FontInfo const & f, int x, int y, int width)
+{
+ FontInfo tmpf = f;
+ tmpf.setXout(FONT_OFF);
+
+ // the definition of \xout in ulem.sty is
+ // \def\xout{\bgroup \markoverwith{\hbox to.35em{\hss/\hss}}\ULon}
+ // Let's mimick it somewhat.
+ double offset = max(0.35 * theFontMetrics(tmpf).em(), 1);
+ for (int i = 0 ; i < iround(width / offset) ; ++i)
+ text(x + iround(i * offset), y, '/', tmpf);
+}
+
+
void GuiPainter::doubleUnderline(FontInfo const & f, int x, int y, int width)
{
FontMetrics const & fm = theFontMetrics(f);
projects / lyx.git / blobdiff