diff options
Diffstat (limited to 'src/gui/text')
23 files changed, 280 insertions, 58 deletions
diff --git a/src/gui/text/coretext/qcoretextfontdatabase.mm b/src/gui/text/coretext/qcoretextfontdatabase.mm index 19f3a2b335..2197c83f29 100644 --- a/src/gui/text/coretext/qcoretextfontdatabase.mm +++ b/src/gui/text/coretext/qcoretextfontdatabase.mm @@ -951,15 +951,13 @@ void QCoreTextFontDatabase::populateThemeFonts() }; // Try populating the font variants based on its UI design trait, if available - if (@available(macos 10.15, ios 13.0, *)) { - auto fontTraits = QCFType<CFDictionaryRef>(CTFontDescriptorCopyAttribute(fontDescriptor, kCTFontTraitsAttribute)); - static const NSString *kUIFontDesignTrait = @"NSCTFontUIFontDesignTrait"; - if (id uiFontDesignTrait = fontTraits.as<NSDictionary*>()[kUIFontDesignTrait]) { - QCFType<CTFontDescriptorRef> designTraitDescriptor = CTFontDescriptorCreateWithAttributes( - CFDictionaryRef(@{ (id)kCTFontTraitsAttribute: @{ kUIFontDesignTrait: uiFontDesignTrait } - })); - addFontVariants(designTraitDescriptor); - } + auto fontTraits = QCFType<CFDictionaryRef>(CTFontDescriptorCopyAttribute(fontDescriptor, kCTFontTraitsAttribute)); + static const NSString *kUIFontDesignTrait = @"NSCTFontUIFontDesignTrait"; + if (id uiFontDesignTrait = fontTraits.as<NSDictionary*>()[kUIFontDesignTrait]) { + QCFType<CTFontDescriptorRef> designTraitDescriptor = CTFontDescriptorCreateWithAttributes( + CFDictionaryRef(@{ (id)kCTFontTraitsAttribute: @{ kUIFontDesignTrait: uiFontDesignTrait } + })); + addFontVariants(designTraitDescriptor); } if (themeFontVariants.isEmpty()) { diff --git a/src/gui/text/coretext/qfontengine_coretext.mm b/src/gui/text/coretext/qfontengine_coretext.mm index 1050c03d75..87ed95f3ac 100644 --- a/src/gui/text/coretext/qfontengine_coretext.mm +++ b/src/gui/text/coretext/qfontengine_coretext.mm @@ -336,7 +336,10 @@ void QCoreTextFontEngine::initializeHeightMetrics() const m_descent = QFixed::fromReal(CTFontGetDescent(ctfont)); m_leading = QFixed::fromReal(CTFontGetLeading(ctfont)); - m_heightMetricsQueried = true; + if (preferTypoLineMetrics()) + QFontEngine::initializeHeightMetrics(); + else + m_heightMetricsQueried = true; } QFixed QCoreTextFontEngine::capHeight() const diff --git a/src/gui/text/freetype/qfontengine_ft.cpp b/src/gui/text/freetype/qfontengine_ft.cpp index d3791f1f6e..f71580a862 100644 --- a/src/gui/text/freetype/qfontengine_ft.cpp +++ b/src/gui/text/freetype/qfontengine_ft.cpp @@ -6,6 +6,7 @@ #include "qtextstream.h" #include "qvariant.h" #include "qfontengine_ft_p.h" +#include "private/qfontdatabase_p.h" #include "private/qimage_p.h" #include <private/qstringiterator_p.h> #include <qguiapplication.h> @@ -55,8 +56,6 @@ QT_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcFontMatch) - using namespace Qt::StringLiterals; #define FLOOR(x) ((x) & -64) diff --git a/src/gui/text/freetype/qfreetypefontdatabase.cpp b/src/gui/text/freetype/qfreetypefontdatabase.cpp index 018e590ac2..37381096a2 100644 --- a/src/gui/text/freetype/qfreetypefontdatabase.cpp +++ b/src/gui/text/freetype/qfreetypefontdatabase.cpp @@ -26,8 +26,6 @@ QT_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcFontDb) - using namespace Qt::StringLiterals; void QFreeTypeFontDatabase::populateFontDatabase() diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp index 916e96ea63..7886d9ba91 100644 --- a/src/gui/text/qcssparser.cpp +++ b/src/gui/text/qcssparser.cpp @@ -36,6 +36,7 @@ struct QCssKnownValue quint64 id; }; +// This array is sorted alphabetically. static const QCssKnownValue properties[NumProperties - 1] = { { "-qt-background-role", QtBackgroundRole }, { "-qt-block-indent", QtBlockIndent }, @@ -47,6 +48,11 @@ static const QCssKnownValue properties[NumProperties - 1] = { { "-qt-list-number-suffix", QtListNumberSuffix }, { "-qt-paragraph-type", QtParagraphType }, { "-qt-stroke-color", QtStrokeColor }, + { "-qt-stroke-dasharray", QtStrokeDashArray }, + { "-qt-stroke-dashoffset", QtStrokeDashOffset }, + { "-qt-stroke-linecap", QtStrokeLineCap }, + { "-qt-stroke-linejoin", QtStrokeLineJoin }, + { "-qt-stroke-miterlimit", QtStrokeMiterLimit }, { "-qt-stroke-width", QtStrokeWidth }, { "-qt-style-features", QtStyleFeatures }, { "-qt-table-type", QtTableType }, @@ -160,6 +166,7 @@ static const QCssKnownValue values[NumKnownValues - 1] = { { "always", Value_Always }, { "auto", Value_Auto }, { "base", Value_Base }, + { "beveljoin", Value_BevelJoin}, { "bold", Value_Bold }, { "bottom", Value_Bottom }, { "bright-text", Value_BrightText }, @@ -176,6 +183,7 @@ static const QCssKnownValue values[NumKnownValues - 1] = { { "dot-dot-dash", Value_DotDotDash }, { "dotted", Value_Dotted }, { "double", Value_Double }, + { "flatcap", Value_FlatCap}, { "groove", Value_Groove }, { "highlight", Value_Highlight }, { "highlighted-text", Value_HighlightedText }, @@ -194,6 +202,7 @@ static const QCssKnownValue values[NumKnownValues - 1] = { { "mid", Value_Mid }, { "middle", Value_Middle }, { "midlight", Value_Midlight }, + { "miterjoin", Value_MiterJoin}, { "native", Value_Native }, { "none", Value_None }, { "normal", Value_Normal }, @@ -208,14 +217,18 @@ static const QCssKnownValue values[NumKnownValues - 1] = { { "pre-wrap", Value_PreWrap }, { "ridge", Value_Ridge }, { "right", Value_Right }, + { "roundcap", Value_RoundCap}, + { "roundjoin", Value_RoundJoin}, { "selected", Value_Selected }, { "shadow", Value_Shadow }, { "small" , Value_Small }, { "small-caps", Value_SmallCaps }, { "solid", Value_Solid }, { "square", Value_Square }, + { "squarecap", Value_SquareCap}, { "sub", Value_Sub }, { "super", Value_Super }, + { "svgmiterjoin", Value_SvgMiterJoin}, { "text", Value_Text }, { "top", Value_Top }, { "transparent", Value_Transparent }, @@ -231,10 +244,10 @@ static const QCssKnownValue values[NumKnownValues - 1] = { }; //Map id to strings as they appears in the 'values' array above -static const short indexOfId[NumKnownValues] = { 0, 41, 48, 42, 49, 50, 55, 35, 26, 71, 72, 25, 43, 5, 64, 48, - 29, 59, 60, 27, 52, 62, 6, 10, 39, 56, 19, 13, 17, 18, 20, 21, 51, 24, 46, 68, 37, 3, 2, 40, 63, 16, - 11, 58, 14, 32, 65, 33, 66, 56, 67, 34, 70, 8, 28, 38, 12, 36, 61, 7, 9, 4, 69, 54, 22, 23, 30, 31, - 1, 15, 0, 53, 45, 44 }; +static const short indexOfId[NumKnownValues] = { 0, 44, 51, 45, 52, 53, 60, 37, 28, 78, 79, 27, 46, 6, 71, 50, + 31, 65, 66, 29, 55, 69, 7, 11, 42, 62, 20, 14, 18, 19, 21, 23, 54, 26, 49, 75, 39, 3, 2, 43, 70, 17, 12, + 63, 15, 34, 72, 35, 73, 61, 74, 36, 64, 22, 56, 41, 5, 57, 67, 77, 9, 30, 40, 13, 38, 68, 8, 10, 4, 76, + 59, 24, 25, 32, 33, 1, 16, 0, 58, 48, 47 }; QString Value::toString() const { @@ -1835,6 +1848,35 @@ bool Declaration::borderCollapseValue() const return d->values.at(0).toString() == "collapse"_L1; } +QList<qreal> Declaration::dashArray() const +{ + if (d->propertyId != Property::QtStrokeDashArray || d->values.empty()) + return QList<qreal>(); + + bool isValid = true; + QList<qreal> dashes; + for (int i = 0; i < d->values.size(); i++) { + Value v = d->values[i]; + // Separators must be at odd indices and Numbers at even indices. + bool isValidSeparator = (i & 1) && v.type == Value::TermOperatorComma; + bool isValidNumber = !(i & 1) && v.type == Value::Number; + if (!isValidNumber && !isValidSeparator) { + isValid = false; + break; + } else if (isValidNumber) { + bool ok; + dashes.append(v.variant.toReal(&ok)); + if (!ok) { + isValid = false; + break; + } + } + } + + isValid &= !(dashes.size() & 1); + return isValid ? dashes : QList<qreal>(); +} + QIcon Declaration::iconValue() const { if (d->parsed.isValid()) diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h index 7742271e41..ba4a611df3 100644 --- a/src/gui/text/qcssparser_p.h +++ b/src/gui/text/qcssparser_p.h @@ -169,6 +169,11 @@ enum Property { QtAccent, QtStrokeWidth, QtStrokeColor, + QtStrokeLineCap, + QtStrokeLineJoin, + QtStrokeMiterLimit, + QtStrokeDashArray, + QtStrokeDashOffset, QtForeground, NumProperties }; @@ -226,6 +231,13 @@ enum KnownValue { Value_SmallCaps, Value_Uppercase, Value_Lowercase, + Value_SquareCap, + Value_FlatCap, + Value_RoundCap, + Value_MiterJoin, + Value_BevelJoin, + Value_RoundJoin, + Value_SvgMiterJoin, /* keep these in same order as QPalette::ColorRole */ Value_FirstColorRole, @@ -451,6 +463,8 @@ struct Q_GUI_EXPORT Declaration void borderImageValue(QString *image, int *cuts, TileMode *h, TileMode *v) const; bool borderCollapseValue() const; + + QList<qreal> dashArray() const; }; QT_CSS_DECLARE_TYPEINFO(Declaration, Q_RELOCATABLE_TYPE) diff --git a/src/gui/text/qdistancefield.cpp b/src/gui/text/qdistancefield.cpp index fe230188c6..5a449ebf90 100644 --- a/src/gui/text/qdistancefield.cpp +++ b/src/gui/text/qdistancefield.cpp @@ -11,7 +11,7 @@ QT_BEGIN_NAMESPACE using namespace Qt::StringLiterals; -Q_LOGGING_CATEGORY(lcDistanceField, "qt.distanceField"); +Q_STATIC_LOGGING_CATEGORY(lcDistanceField, "qt.distanceField"); namespace { @@ -839,14 +839,9 @@ QDistanceFieldData *QDistanceFieldData::create(const QSize &size) return data; } -QDistanceFieldData *QDistanceFieldData::create(const QPainterPath &path, bool doubleResolution) +QDistanceFieldData *QDistanceFieldData::create(QSize size, const QPainterPath &path, bool doubleResolution) { - int dfMargin = QT_DISTANCEFIELD_RADIUS(doubleResolution) / QT_DISTANCEFIELD_SCALE(doubleResolution); - int glyphWidth = qCeil(path.boundingRect().width() / QT_DISTANCEFIELD_SCALE(doubleResolution)) + dfMargin * 2; - int glyphHeight = qCeil(path.boundingRect().height() / QT_DISTANCEFIELD_SCALE(doubleResolution)) + dfMargin * 2; - - QDistanceFieldData *data = create(QSize(glyphWidth, glyphHeight)); - + QDistanceFieldData *data = create(size); makeDistanceField(data, path, QT_DISTANCEFIELD_SCALE(doubleResolution), @@ -855,6 +850,16 @@ QDistanceFieldData *QDistanceFieldData::create(const QPainterPath &path, bool do } +QDistanceFieldData *QDistanceFieldData::create(const QPainterPath &path, bool doubleResolution) +{ + int dfMargin = QT_DISTANCEFIELD_RADIUS(doubleResolution) / QT_DISTANCEFIELD_SCALE(doubleResolution); + int glyphWidth = qCeil(path.boundingRect().width() / QT_DISTANCEFIELD_SCALE(doubleResolution)) + dfMargin * 2; + int glyphHeight = qCeil(path.boundingRect().height() / QT_DISTANCEFIELD_SCALE(doubleResolution)) + dfMargin * 2; + + return create(QSize(glyphWidth, glyphHeight), path, doubleResolution); +} + + QDistanceField::QDistanceField() : d(new QDistanceFieldData) { @@ -875,6 +880,16 @@ QDistanceField::QDistanceField(QFontEngine *fontEngine, glyph_t glyph, bool doub setGlyph(fontEngine, glyph, doubleResolution); } +QDistanceField::QDistanceField(QSize size, const QPainterPath &path, glyph_t glyph, bool doubleResolution) +{ + QPainterPath dfPath = path; + dfPath.translate(-dfPath.boundingRect().topLeft()); + dfPath.setFillRule(Qt::WindingFill); + + d = QDistanceFieldData::create(size, dfPath, doubleResolution); + d->glyph = glyph; +} + QDistanceField::QDistanceField(const QPainterPath &path, glyph_t glyph, bool doubleResolution) { QPainterPath dfPath = path; diff --git a/src/gui/text/qdistancefield_p.h b/src/gui/text/qdistancefield_p.h index dbc7a0abb5..ec00e5b0f8 100644 --- a/src/gui/text/qdistancefield_p.h +++ b/src/gui/text/qdistancefield_p.h @@ -42,6 +42,7 @@ public: static QDistanceFieldData *create(const QSize &size); static QDistanceFieldData *create(const QPainterPath &path, bool doubleResolution); + static QDistanceFieldData *create(QSize size, const QPainterPath &path, bool doubleResolution); glyph_t glyph; int width; @@ -58,6 +59,7 @@ public: QDistanceField(const QRawFont &font, glyph_t glyph, bool doubleResolution = false); QDistanceField(QFontEngine *fontEngine, glyph_t glyph, bool doubleResolution = false); QDistanceField(const QPainterPath &path, glyph_t glyph, bool doubleResolution = false); + QDistanceField(QSize size, const QPainterPath &path, glyph_t glyph, bool doubleResolution = false); bool isNull() const; diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index f3a35a4269..c8881a9bf8 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -1470,6 +1470,23 @@ QFont::StyleHint QFont::styleHint() const font that matches the largest subset of the input string instead. This will be more expensive for strings where missing glyphs occur, but may give more consistent results. If \c NoFontMerging is set, then \c ContextFontMerging will have no effect. + \value [since 6.8] PreferTypoLineMetrics For compatibility reasons, OpenType fonts contain + two competing sets of the vertical line metrics that provide the + \l{QFontMetricsF::ascent()}{ascent}, \l{QFontMetricsF::descent()}{descent} and + \l{QFontMetricsF::leading()}{leading} of the font. These are often referred to as the + \l{https://learn.microsoft.com/en-us/typography/opentype/spec/os2#uswinascent}{win} + (Windows) metrics and the + \l{https://learn.microsoft.com/en-us/typography/opentype/spec/os2#sta}{typo} + (typographical) metrics. While the specification recommends using the \c typo metrics for + line spacing, many applications prefer the \c win metrics unless the \c{USE_TYPO_METRICS} + flag is set in the + \l{https://learn.microsoft.com/en-us/typography/opentype/spec/os2#fsselection}{fsSelection} + field of the font. For backwards-compatibility reasons, this is also the case for Qt + applications. This is not an issue for fonts that set the \c{USE_TYPO_METRICS} flag to + indicate that the \c{typo} metrics are valid, nor for fonts where the \c{win} metrics + and \c{typo} metrics match up. However, for certain fonts the \c{win} metrics may be + larger than the preferable line spacing and the \c{USE_TYPO_METRICS} flag may be unset + by mistake. For such fonts, setting \c{PreferTypoLineMetrics} may give superior results. \value NoFontMerging If the font selected for a certain writing system does not contain a character requested to draw, then Qt automatically chooses a similar looking font that contains the character. The NoFontMerging flag disables this feature. diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index 66a5f7c155..0b41e31bdb 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -36,19 +36,20 @@ public: Q_ENUM(StyleHint) enum StyleStrategy { - PreferDefault = 0x0001, - PreferBitmap = 0x0002, - PreferDevice = 0x0004, - PreferOutline = 0x0008, - ForceOutline = 0x0010, - PreferMatch = 0x0020, - PreferQuality = 0x0040, - PreferAntialias = 0x0080, - NoAntialias = 0x0100, - NoSubpixelAntialias = 0x0800, - PreferNoShaping = 0x1000, - ContextFontMerging = 0x2000, - NoFontMerging = 0x8000 + PreferDefault = 0x0001, + PreferBitmap = 0x0002, + PreferDevice = 0x0004, + PreferOutline = 0x0008, + ForceOutline = 0x0010, + PreferMatch = 0x0020, + PreferQuality = 0x0040, + PreferAntialias = 0x0080, + NoAntialias = 0x0100, + NoSubpixelAntialias = 0x0800, + PreferNoShaping = 0x1000, + ContextFontMerging = 0x2000, + PreferTypoLineMetrics = 0x4000, + NoFontMerging = 0x8000 }; Q_ENUM(StyleStrategy) diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index d3a13d801b..3d6d3b7886 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -670,7 +670,7 @@ static QStringList fallbacksForFamily(const QString &family, QFont::Style style, return *fallbacks; // make sure that the db has all fallback families - QStringList userFallbacks = db->applicationFallbackFontFamilies.value(script == QChar::Script_Common ? QChar::Script_Latin : script); + QStringList userFallbacks = db->applicationFallbackFontFamilies.value(script == QChar::Script_Latin ? QChar::Script_Common : script); QStringList retList = userFallbacks + QGuiApplicationPrivate::platformIntegration()->fontDatabase()->fallbacksForFamily(family,style,styleHint,script); QStringList::iterator i; @@ -2187,6 +2187,8 @@ int QFontDatabasePrivate::addAppFont(const QByteArray &fontData, const QString & // loaded, so it has to be flushed. QFontCache::instance()->clear(); + fallbacksCache.clear(); + emit qApp->fontDatabaseChanged(); return i; @@ -2386,23 +2388,32 @@ bool QFontDatabase::removeAllApplicationFonts() be prioritized in reverse order, so that the last family added will be checked first and so on. + \note Qt's font matching algorithm considers \c{QChar::Script_Common} (undetermined script) + and \c{QChar::Script_Latin} the same. Adding a fallback for either of these will also apply + to the other. + \sa setApplicationFallbackFontFamilies(), removeApplicationFallbackFontFamily(), applicationFallbackFontFamilies() */ void QFontDatabase::addApplicationFallbackFontFamily(QChar::Script script, const QString &familyName) { QMutexLocker locker(fontDatabaseMutex()); - if (script < QChar::Script_Latin) { + if (script < QChar::Script_Common) { qCWarning(lcFontDb) << "Invalid script passed to addApplicationFallbackFontFamily:" << script; return; } + if (script == QChar::Script_Latin) + script = QChar::Script_Common; + auto *db = QFontDatabasePrivate::instance(); auto it = db->applicationFallbackFontFamilies.find(script); if (it == db->applicationFallbackFontFamilies.end()) it = db->applicationFallbackFontFamilies.insert(script, QStringList{}); it->prepend(familyName); + + QFontCache::instance()->clear(); db->fallbacksCache.clear(); } @@ -2420,6 +2431,14 @@ bool QFontDatabase::removeApplicationFallbackFontFamily(QChar::Script script, co { QMutexLocker locker(fontDatabaseMutex()); + if (script < QChar::Script_Common) { + qCWarning(lcFontDb) << "Invalid script passed to removeApplicationFallbackFontFamily:" << script; + return false; + } + + if (script == QChar::Script_Latin) + script = QChar::Script_Common; + auto *db = QFontDatabasePrivate::instance(); auto it = db->applicationFallbackFontFamilies.find(script); if (it != db->applicationFallbackFontFamilies.end()) { @@ -2452,11 +2471,14 @@ void QFontDatabase::setApplicationFallbackFontFamilies(QChar::Script script, con { QMutexLocker locker(fontDatabaseMutex()); - if (script < QChar::Script_Latin) { + if (script < QChar::Script_Common) { qCWarning(lcFontDb) << "Invalid script passed to setApplicationFallbackFontFamilies:" << script; return; } + if (script == QChar::Script_Latin) + script = QChar::Script_Common; + auto *db = QFontDatabasePrivate::instance(); db->applicationFallbackFontFamilies[script] = familyNames; @@ -2476,6 +2498,9 @@ QStringList QFontDatabase::applicationFallbackFontFamilies(QChar::Script script) { QMutexLocker locker(fontDatabaseMutex()); + if (script == QChar::Script_Latin) + script = QChar::Script_Common; + auto *db = QFontDatabasePrivate::instance(); return db->applicationFallbackFontFamilies.value(script); } diff --git a/src/gui/text/qfontdatabase_p.h b/src/gui/text/qfontdatabase_p.h index 38e1b4ad20..72fda436e8 100644 --- a/src/gui/text/qfontdatabase_p.h +++ b/src/gui/text/qfontdatabase_p.h @@ -16,12 +16,16 @@ // #include <QtCore/qcache.h> +#include <QtCore/qloggingcategory.h> #include <QtGui/qfontdatabase.h> #include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE +Q_DECLARE_LOGGING_CATEGORY(lcFontDb) +Q_DECLARE_LOGGING_CATEGORY(lcFontMatch) + struct QtFontDesc; struct QtFontFallbacksCacheKey diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index 4e78aaac2e..ee74c7f8fb 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -430,6 +430,11 @@ void QFontEngine::initializeHeightMetrics() const m_heightMetricsQueried = true; } +bool QFontEngine::preferTypoLineMetrics() const +{ + return (fontDef.styleStrategy & QFont::PreferTypoLineMetrics) != 0; +} + bool QFontEngine::processOS2Table() const { QByteArray os2 = getSfntTable(QFont::Tag("OS/2").value()); @@ -444,7 +449,7 @@ bool QFontEngine::processOS2Table() const enum { USE_TYPO_METRICS = 0x80 }; QFixed unitsPerEm = emSquareSize(); - if (fsSelection & USE_TYPO_METRICS) { + if (preferTypoLineMetrics() || fsSelection & USE_TYPO_METRICS) { // Some fonts may have invalid OS/2 data. We detect this and bail out. if (typoAscent == 0 && typoDescent == 0) return false; diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h index a0e0801354..807f02fdc7 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -148,6 +148,7 @@ public: return subPixelPositionFor(QFixedPoint(x, 0)).x; } + bool preferTypoLineMetrics() const; bool isColorFont() const { return glyphFormat == Format_ARGB; } static bool isIgnorableChar(char32_t ucs4) { diff --git a/src/gui/text/qplatformfontdatabase.h b/src/gui/text/qplatformfontdatabase.h index 3007a11838..f8f4d3bfae 100644 --- a/src/gui/text/qplatformfontdatabase.h +++ b/src/gui/text/qplatformfontdatabase.h @@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE -Q_DECLARE_EXPORTED_LOGGING_CATEGORY(lcQpaFonts, Q_GUI_EXPORT) +QT_DECLARE_EXPORTED_QT_LOGGING_CATEGORY(lcQpaFonts, Q_GUI_EXPORT) class QWritingSystemsPrivate; diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index ab788a5f9b..a7d3b8f1b1 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -43,8 +43,6 @@ QT_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcLayout); - using namespace Qt::StringLiterals; Q_CORE_EXPORT Q_DECL_CONST_FUNCTION unsigned int qt_int_sqrt(unsigned int n); @@ -53,6 +51,9 @@ namespace { QTextDocument::ResourceProvider qt_defaultResourceProvider; }; +QAbstractUndoItem::~QAbstractUndoItem() + = default; + /*! \fn bool Qt::mightBeRichText(QAnyStringView text) @@ -2757,6 +2758,51 @@ bool QTextHtmlExporter::emitCharFormatStyle(const QTextCharFormat &format) html += " -qt-stroke-width:"_L1; html += QString::number(outlinePen.widthF()); html += "px;"_L1; + + html += " -qt-stroke-linecap:"_L1; + if (outlinePen.capStyle() == Qt::SquareCap) + html += "squarecap;"_L1; + else if (outlinePen.capStyle() == Qt::FlatCap) + html += "flatcap;"_L1; + else if (outlinePen.capStyle() == Qt::RoundCap) + html += "roundcap;"_L1; + + html += " -qt-stroke-linejoin:"_L1; + if (outlinePen.joinStyle() == Qt::MiterJoin) + html += "miterjoin;"_L1; + else if (outlinePen.joinStyle() == Qt::SvgMiterJoin) + html += "svgmiterjoin;"_L1; + else if (outlinePen.joinStyle() == Qt::BevelJoin) + html += "beveljoin;"_L1; + else if (outlinePen.joinStyle() == Qt::RoundJoin) + html += "roundjoin;"_L1; + + if (outlinePen.joinStyle() == Qt::MiterJoin || + outlinePen.joinStyle() == Qt::SvgMiterJoin) { + html += " -qt-stroke-miterlimit:"_L1; + html += QString::number(outlinePen.miterLimit()); + html += u';'; + } + + if (outlinePen.style() == Qt::CustomDashLine && !outlinePen.dashPattern().empty()) { + html += " -qt-stroke-dasharray:"_L1; + QString dashArrayString; + QList<qreal> dashes = outlinePen.dashPattern(); + + for (int i = 0; i < dashes.length() - 1; i++) { + qreal dash = dashes[i]; + dashArrayString += QString::number(dash) + u','; + } + + dashArrayString += QString::number(dashes.last()); + html += dashArrayString; + html += u';'; + + html += " -qt-stroke-dashoffset:"_L1; + html += QString::number(outlinePen.dashOffset()); + html += u';'; + } + attributesEmitted = true; } diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h index b6253bfa46..11a8abcb50 100644 --- a/src/gui/text/qtextdocument.h +++ b/src/gui/text/qtextdocument.h @@ -45,15 +45,11 @@ namespace Qt class Q_GUI_EXPORT QAbstractUndoItem { public: - virtual ~QAbstractUndoItem() = 0; + virtual ~QAbstractUndoItem(); virtual void undo() = 0; virtual void redo() = 0; }; -inline QAbstractUndoItem::~QAbstractUndoItem() -{ -} - class QTextDocumentPrivate; class Q_GUI_EXPORT QTextDocument : public QObject diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index 452f814231..406ef9d86f 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -31,10 +31,10 @@ QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcDraw, "qt.text.drawing") -Q_LOGGING_CATEGORY(lcHit, "qt.text.hittest") +Q_STATIC_LOGGING_CATEGORY(lcDraw, "qt.text.drawing") +Q_STATIC_LOGGING_CATEGORY(lcHit, "qt.text.hittest") Q_LOGGING_CATEGORY(lcLayout, "qt.text.layout") -Q_LOGGING_CATEGORY(lcTable, "qt.text.layout.table") +Q_STATIC_LOGGING_CATEGORY(lcTable, "qt.text.layout.table") // ################ should probably add frameFormatChange notification! diff --git a/src/gui/text/qtextdocumentlayout_p.h b/src/gui/text/qtextdocumentlayout_p.h index 9f21d8ed39..8f8f1b2fe5 100644 --- a/src/gui/text/qtextdocumentlayout_p.h +++ b/src/gui/text/qtextdocumentlayout_p.h @@ -19,9 +19,12 @@ #include "QtGui/qabstracttextdocumentlayout.h" #include "QtGui/qtextoption.h" #include "QtGui/qtextobject.h" +#include "QtCore/qloggingcategory.h" QT_BEGIN_NAMESPACE +Q_DECLARE_LOGGING_CATEGORY(lcLayout) + class QTextListFormat; class QTextTableCell; class QTextDocumentLayoutPrivate; diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp index bc2200697d..54c291b82e 100644 --- a/src/gui/text/qtexthtmlparser.cpp +++ b/src/gui/text/qtexthtmlparser.cpp @@ -1422,6 +1422,61 @@ void QTextHtmlParserNode::applyCssDeclarations(const QList<QCss::Declaration> &d } break; } + case QCss::QtStrokeLineCap: + { + QPen pen = charFormat.textOutline(); + switch (identifier) { + case QCss::Value_SquareCap: pen.setCapStyle(Qt::SquareCap); break; + case QCss::Value_FlatCap: pen.setCapStyle(Qt::FlatCap); break; + case QCss::Value_RoundCap: pen.setCapStyle(Qt::RoundCap); break; + default: break; + } + charFormat.setTextOutline(pen); + break; + } + case QCss::QtStrokeLineJoin: + { + QPen pen = charFormat.textOutline(); + switch (identifier) { + case QCss::Value_MiterJoin: pen.setJoinStyle(Qt::MiterJoin); break; + case QCss::Value_BevelJoin: pen.setJoinStyle(Qt::BevelJoin); break; + case QCss::Value_RoundJoin: pen.setJoinStyle(Qt::RoundJoin); break; + case QCss::Value_SvgMiterJoin: pen.setJoinStyle(Qt::SvgMiterJoin); break; + default: break; + } + charFormat.setTextOutline(pen); + break; + } + case QCss::QtStrokeMiterLimit: + { + qreal miterLimit; + if (decl.realValue(&miterLimit)) { + QPen pen = charFormat.textOutline(); + pen.setMiterLimit(miterLimit); + charFormat.setTextOutline(pen); + } + break; + } + case QCss::QtStrokeDashArray: + { + QList<qreal> dashes = decl.dashArray(); + if (!dashes.empty()) { + QPen pen = charFormat.textOutline(); + pen.setDashPattern(dashes); + charFormat.setTextOutline(pen); + } + break; + } + case QCss::QtStrokeDashOffset: + { + qreal dashOffset; + if (decl.realValue(&dashOffset)) { + QPen pen = charFormat.textOutline(); + pen.setDashOffset(dashOffset); + charFormat.setTextOutline(pen); + } + break; + } case QCss::QtForeground: { QBrush brush = decl.brushValue(); diff --git a/src/gui/text/qtextmarkdownimporter.cpp b/src/gui/text/qtextmarkdownimporter.cpp index e7fcad67b5..add88da180 100644 --- a/src/gui/text/qtextmarkdownimporter.cpp +++ b/src/gui/text/qtextmarkdownimporter.cpp @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE using namespace Qt::StringLiterals; -Q_LOGGING_CATEGORY(lcMD, "qt.text.markdown") +Q_STATIC_LOGGING_CATEGORY(lcMD, "qt.text.markdown") static const QChar qtmi_Newline = u'\n'; static const QChar qtmi_Space = u' '; diff --git a/src/gui/text/qtextmarkdownwriter.cpp b/src/gui/text/qtextmarkdownwriter.cpp index 361158e722..2e23dfcd94 100644 --- a/src/gui/text/qtextmarkdownwriter.cpp +++ b/src/gui/text/qtextmarkdownwriter.cpp @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE using namespace Qt::StringLiterals; -Q_LOGGING_CATEGORY(lcMDW, "qt.text.markdown.writer") +Q_STATIC_LOGGING_CATEGORY(lcMDW, "qt.text.markdown.writer") static const QChar qtmw_Space = u' '; static const QChar qtmw_Tab = u'\t'; diff --git a/src/gui/text/unix/qfontconfigdatabase.cpp b/src/gui/text/unix/qfontconfigdatabase.cpp index d607d38235..cfa141f5ed 100644 --- a/src/gui/text/unix/qfontconfigdatabase.cpp +++ b/src/gui/text/unix/qfontconfigdatabase.cpp @@ -28,8 +28,6 @@ QT_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcFontDb) - static inline int mapToQtWeightForRange(int fcweight, int fcLower, int fcUpper, int qtLower, int qtUpper) { return qtLower + ((fcweight - fcLower) * (qtUpper - qtLower)) / (fcUpper - fcLower); |