mirror of
https://github.com/danog/patches.git
synced 2024-11-30 04:19:34 +01:00
Remove controls palette patch.
This commit is contained in:
John Preston
parent
b0ec5df5a3
commit
4aa377ccb0
@ -88,6 +88,149 @@ index f8a91e9ef3..50c60b2d71 100644
|
|||||||
|
|
||||||
inline void QBezier::parameterSplitLeft(qreal t, QBezier *left)
|
inline void QBezier::parameterSplitLeft(qreal t, QBezier *left)
|
||||||
{
|
{
|
||||||
|
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
|
||||||
|
index b70b29e54e..9519894076 100644
|
||||||
|
--- a/src/gui/painting/qpainter.cpp
|
||||||
|
+++ b/src/gui/painting/qpainter.cpp
|
||||||
|
@@ -6245,6 +6245,91 @@ static QPixmap generateWavyPixmap(qreal maxRadius, const QPen &pen)
|
||||||
|
return pixmap;
|
||||||
|
}
|
||||||
|
|
||||||
|
+// Patch: Improved underline with SpellCheck style for macOS and Windows.
|
||||||
|
+// Added implementation of underline drawing from Chrome.
|
||||||
|
+static QPixmap generateChromeSpellcheckPixmap(qreal descent, qreal factor, const QPen &pen) {
|
||||||
|
+ QString key = QLatin1String("ChromeUnderline-")
|
||||||
|
+ % pen.color().name()
|
||||||
|
+ % HexString<qreal>(factor)
|
||||||
|
+ % HexString<qreal>(pen.widthF());
|
||||||
|
+
|
||||||
|
+ QPixmap pixmap;
|
||||||
|
+ if (QPixmapCache::find(key, pixmap)) {
|
||||||
|
+ return pixmap;
|
||||||
|
+ }
|
||||||
|
+ // https://chromium.googlesource.com/chromium/src/+/refs/heads/master/third_party/blink/renderer/core/paint/document_marker_painter.cc
|
||||||
|
+
|
||||||
|
+#ifdef Q_OS_MAC
|
||||||
|
+
|
||||||
|
+ constexpr qreal kMarkerHeight = 3;
|
||||||
|
+
|
||||||
|
+ const qreal height = kMarkerHeight * factor;
|
||||||
|
+ const qreal width = height * 2;
|
||||||
|
+
|
||||||
|
+ pixmap = QPixmap(qCeil(width), qFloor(height) * 2);
|
||||||
|
+ pixmap.setDevicePixelRatio(qApp->devicePixelRatio());
|
||||||
|
+ pixmap.fill(Qt::transparent);
|
||||||
|
+ {
|
||||||
|
+ QPainter imgPainter(&pixmap);
|
||||||
|
+ imgPainter.setPen(Qt::NoPen);
|
||||||
|
+ imgPainter.setBrush(pen.color());
|
||||||
|
+ imgPainter.setRenderHints(
|
||||||
|
+ QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
|
||||||
|
+ imgPainter.drawEllipse(0, 0, qFloor(height), qFloor(height));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+#else
|
||||||
|
+
|
||||||
|
+ constexpr qreal kMarkerWidth = 4;
|
||||||
|
+ constexpr qreal kMarkerHeight = 2;
|
||||||
|
+
|
||||||
|
+ const auto x1 = (kMarkerWidth * -3 / 8) * factor;
|
||||||
|
+ const auto y1 = (kMarkerHeight * 3 / 4) * factor;
|
||||||
|
+
|
||||||
|
+ const auto cY = (kMarkerHeight * 1 / 4) * factor;
|
||||||
|
+
|
||||||
|
+ const auto c1X1 = (kMarkerWidth * -1 / 8) * factor;
|
||||||
|
+ const auto c1X2 = (kMarkerWidth * 3 / 8) * factor;
|
||||||
|
+ const auto c1X3 = (kMarkerWidth * 7 / 8) * factor;
|
||||||
|
+
|
||||||
|
+ const auto c2X1 = (kMarkerWidth * 1 / 8) * factor;
|
||||||
|
+ const auto c2X2 = (kMarkerWidth * 5 / 8) * factor;
|
||||||
|
+ const auto c2X3 = (kMarkerWidth * 9 / 8) * factor;
|
||||||
|
+
|
||||||
|
+ QPainterPath path;
|
||||||
|
+ path.moveTo(x1, y1);
|
||||||
|
+ path.cubicTo(c1X1, y1,
|
||||||
|
+ c1X1, cY,
|
||||||
|
+ c2X1, cY);
|
||||||
|
+ path.cubicTo(c1X2, cY,
|
||||||
|
+ c1X2, y1,
|
||||||
|
+ c2X2, y1);
|
||||||
|
+ path.cubicTo(c1X3, y1,
|
||||||
|
+ c1X3, cY,
|
||||||
|
+ c2X3, cY);
|
||||||
|
+
|
||||||
|
+ pixmap = QPixmap(kMarkerWidth * factor, kMarkerHeight * factor * 2);
|
||||||
|
+ pixmap.fill(Qt::transparent);
|
||||||
|
+ {
|
||||||
|
+ QPen wavePen = pen;
|
||||||
|
+ wavePen.setCapStyle(Qt::RoundCap);
|
||||||
|
+ wavePen.setJoinStyle(Qt::RoundJoin);
|
||||||
|
+ wavePen.setWidthF(1 * factor);
|
||||||
|
+
|
||||||
|
+ QPainter imgPainter(&pixmap);
|
||||||
|
+ imgPainter.setPen(std::move(wavePen));
|
||||||
|
+ imgPainter.setRenderHint(QPainter::Antialiasing);
|
||||||
|
+ imgPainter.translate(0, descent - (kMarkerHeight * factor));
|
||||||
|
+ imgPainter.drawPath(std::move(path));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+ QPixmapCache::insert(std::move(key), pixmap);
|
||||||
|
+
|
||||||
|
+ return pixmap;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const QFontEngine *fe, QTextEngine *textEngine,
|
||||||
|
QTextCharFormat::UnderlineStyle underlineStyle,
|
||||||
|
QTextItem::RenderFlags flags, qreal width,
|
||||||
|
@@ -6262,7 +6347,9 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const
|
||||||
|
pen.setWidthF(fe->lineThickness().toReal());
|
||||||
|
pen.setCapStyle(Qt::FlatCap);
|
||||||
|
|
||||||
|
- QLineF line(qFloor(pos.x()), pos.y(), qFloor(pos.x() + width), pos.y());
|
||||||
|
+ // Patch: Improved underline with SpellCheck style for macOS and Windows.
|
||||||
|
+ // Slightly move the beginning of the underline to the right.
|
||||||
|
+ QLineF line(qFloor(pos.x() + 1), pos.y(), qFloor(pos.x() + width), pos.y());
|
||||||
|
|
||||||
|
bool wasCompatiblePainting = painter->renderHints()
|
||||||
|
& QPainter::Qt4CompatiblePainting;
|
||||||
|
@@ -6273,13 +6360,29 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const
|
||||||
|
const qreal underlineOffset = fe->underlinePosition().toReal();
|
||||||
|
|
||||||
|
if (underlineStyle == QTextCharFormat::SpellCheckUnderline) {
|
||||||
|
- QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme();
|
||||||
|
- if (theme)
|
||||||
|
- underlineStyle = QTextCharFormat::UnderlineStyle(theme->themeHint(QPlatformTheme::SpellCheckUnderlineStyle).toInt());
|
||||||
|
- if (underlineStyle == QTextCharFormat::SpellCheckUnderline) // still not resolved
|
||||||
|
- underlineStyle = QTextCharFormat::WaveUnderline;
|
||||||
|
- }
|
||||||
|
+ const qreal fontFactor = qreal(charFormat.font().pixelSize()) / qreal(10.);
|
||||||
|
+ painter->save();
|
||||||
|
+ painter->translate(0, pos.y() + 1);
|
||||||
|
+ const qreal maxHeight = fe->descent().toReal() - qreal(1);
|
||||||
|
+
|
||||||
|
+ QColor uc = charFormat.underlineColor();
|
||||||
|
+ if (uc.isValid())
|
||||||
|
+ pen.setColor(uc);
|
||||||
|
|
||||||
|
+ const QPixmap wave = generateChromeSpellcheckPixmap(maxHeight, fontFactor, pen);
|
||||||
|
+ const int descent = qFloor(maxHeight);
|
||||||
|
+
|
||||||
|
+ painter->setBrushOrigin(painter->brushOrigin().x(), 0);
|
||||||
|
+#ifdef Q_OS_MAC
|
||||||
|
+ const auto h = wave.height() / 2;
|
||||||
|
+ painter->drawTiledPixmap(
|
||||||
|
+ QRectF(pos.x(), (descent - h) / 2., qCeil(width), h),
|
||||||
|
+ wave);
|
||||||
|
+#else
|
||||||
|
+ painter->fillRect(pos.x(), 0, qCeil(width), descent, wave);
|
||||||
|
+#endif
|
||||||
|
+ painter->restore();
|
||||||
|
+ } else
|
||||||
|
if (underlineStyle == QTextCharFormat::WaveUnderline) {
|
||||||
|
painter->save();
|
||||||
|
painter->translate(0, pos.y() + 1);
|
||||||
diff --git a/src/gui/text/qinputcontrol.cpp b/src/gui/text/qinputcontrol.cpp
|
diff --git a/src/gui/text/qinputcontrol.cpp b/src/gui/text/qinputcontrol.cpp
|
||||||
index 3381fdb673..6036f052e9 100644
|
index 3381fdb673..6036f052e9 100644
|
||||||
--- a/src/gui/text/qinputcontrol.cpp
|
--- a/src/gui/text/qinputcontrol.cpp
|
||||||
@ -235,30 +378,6 @@ index 350ae4b9be..457bb3408d 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
diff --git a/src/plugins/platforms/cocoa/qcocoasystemsettings.mm b/src/plugins/platforms/cocoa/qcocoasystemsettings.mm
|
|
||||||
index 9b6dc94d33..2f67cbe467 100644
|
|
||||||
--- a/src/plugins/platforms/cocoa/qcocoasystemsettings.mm
|
|
||||||
+++ b/src/plugins/platforms/cocoa/qcocoasystemsettings.mm
|
|
||||||
@@ -83,13 +83,17 @@ QPalette * qt_mac_createSystemPalette()
|
|
||||||
palette->setColor(QPalette::Inactive, QPalette::Dark, QColor(191, 191, 191));
|
|
||||||
|
|
||||||
// System palette initialization:
|
|
||||||
- QBrush br = qt_mac_toQBrush([NSColor selectedControlColor]);
|
|
||||||
- palette->setBrush(QPalette::Active, QPalette::Highlight, br);
|
|
||||||
if (__builtin_available(macOS 10.14, *)) {
|
|
||||||
+ // Patch: Use colors consistently, otherwise selected text is invisible,
|
|
||||||
+ // if you choose Dark Mode with Graphite highlight color.
|
|
||||||
+ QBrush highlight = qt_mac_toQBrush([NSColor selectedContentBackgroundColor]);
|
|
||||||
+ palette->setBrush(QPalette::Active, QPalette::Highlight, highlight);
|
|
||||||
const auto inactiveHighlight = qt_mac_toQBrush([NSColor unemphasizedSelectedContentBackgroundColor]);
|
|
||||||
palette->setBrush(QPalette::Inactive, QPalette::Highlight, inactiveHighlight);
|
|
||||||
palette->setBrush(QPalette::Disabled, QPalette::Highlight, inactiveHighlight);
|
|
||||||
} else {
|
|
||||||
+ QBrush br = qt_mac_toQBrush([NSColor selectedControlColor]);
|
|
||||||
+ palette->setBrush(QPalette::Active, QPalette::Highlight, br);
|
|
||||||
palette->setBrush(QPalette::Inactive, QPalette::Highlight, br);
|
|
||||||
palette->setBrush(QPalette::Disabled, QPalette::Highlight, br);
|
|
||||||
}
|
|
||||||
diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
|
diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
|
||||||
index 597cfa8318..579d79734d 100644
|
index 597cfa8318..579d79734d 100644
|
||||||
--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
|
--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
|
||||||
@ -687,146 +806,3 @@ index 598d173144..fd2e636563 100644
|
|||||||
return max;
|
return max;
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
|
|
||||||
index b70b29e54e..23e701493c 100644
|
|
||||||
--- a/src/gui/painting/qpainter.cpp
|
|
||||||
+++ b/src/gui/painting/qpainter.cpp
|
|
||||||
@@ -6245,6 +6245,91 @@ static QPixmap generateWavyPixmap(qreal maxRadius, const QPen &pen)
|
|
||||||
return pixmap;
|
|
||||||
}
|
|
||||||
|
|
||||||
+// Patch: Improved underline with SpellCheck style for macOS and Windows.
|
|
||||||
+// Added implementation of underline drawing from Chrome.
|
|
||||||
+static QPixmap generateChromeSpellcheckPixmap(qreal descent, qreal factor, const QPen &pen) {
|
|
||||||
+ QString key = QLatin1String("ChromeUnderline-")
|
|
||||||
+ % pen.color().name()
|
|
||||||
+ % HexString<qreal>(factor)
|
|
||||||
+ % HexString<qreal>(pen.widthF());
|
|
||||||
+
|
|
||||||
+ QPixmap pixmap;
|
|
||||||
+ if (QPixmapCache::find(key, pixmap)) {
|
|
||||||
+ return pixmap;
|
|
||||||
+ }
|
|
||||||
+ // https://chromium.googlesource.com/chromium/src/+/refs/heads/master/third_party/blink/renderer/core/paint/document_marker_painter.cc
|
|
||||||
+
|
|
||||||
+#ifdef Q_OS_MAC
|
|
||||||
+
|
|
||||||
+ constexpr qreal kMarkerHeight = 3;
|
|
||||||
+
|
|
||||||
+ const qreal height = kMarkerHeight * factor;
|
|
||||||
+ const qreal width = height * 2;
|
|
||||||
+
|
|
||||||
+ pixmap = QPixmap(qCeil(width), qFloor(height) * 2);
|
|
||||||
+ pixmap.setDevicePixelRatio(qApp->devicePixelRatio());
|
|
||||||
+ pixmap.fill(Qt::transparent);
|
|
||||||
+ {
|
|
||||||
+ QPainter imgPainter(&pixmap);
|
|
||||||
+ imgPainter.setPen(Qt::NoPen);
|
|
||||||
+ imgPainter.setBrush(pen.color());
|
|
||||||
+ imgPainter.setRenderHints(
|
|
||||||
+ QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
|
|
||||||
+ imgPainter.drawEllipse(0, 0, qFloor(height), qFloor(height));
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+#else
|
|
||||||
+
|
|
||||||
+ constexpr qreal kMarkerWidth = 4;
|
|
||||||
+ constexpr qreal kMarkerHeight = 2;
|
|
||||||
+
|
|
||||||
+ const auto x1 = (kMarkerWidth * -3 / 8) * factor;
|
|
||||||
+ const auto y1 = (kMarkerHeight * 3 / 4) * factor;
|
|
||||||
+
|
|
||||||
+ const auto cY = (kMarkerHeight * 1 / 4) * factor;
|
|
||||||
+
|
|
||||||
+ const auto c1X1 = (kMarkerWidth * -1 / 8) * factor;
|
|
||||||
+ const auto c1X2 = (kMarkerWidth * 3 / 8) * factor;
|
|
||||||
+ const auto c1X3 = (kMarkerWidth * 7 / 8) * factor;
|
|
||||||
+
|
|
||||||
+ const auto c2X1 = (kMarkerWidth * 1 / 8) * factor;
|
|
||||||
+ const auto c2X2 = (kMarkerWidth * 5 / 8) * factor;
|
|
||||||
+ const auto c2X3 = (kMarkerWidth * 9 / 8) * factor;
|
|
||||||
+
|
|
||||||
+ QPainterPath path;
|
|
||||||
+ path.moveTo(x1, y1);
|
|
||||||
+ path.cubicTo(c1X1, y1,
|
|
||||||
+ c1X1, cY,
|
|
||||||
+ c2X1, cY);
|
|
||||||
+ path.cubicTo(c1X2, cY,
|
|
||||||
+ c1X2, y1,
|
|
||||||
+ c2X2, y1);
|
|
||||||
+ path.cubicTo(c1X3, y1,
|
|
||||||
+ c1X3, cY,
|
|
||||||
+ c2X3, cY);
|
|
||||||
+
|
|
||||||
+ pixmap = QPixmap(kMarkerWidth * factor, kMarkerHeight * factor * 2);
|
|
||||||
+ pixmap.fill(Qt::transparent);
|
|
||||||
+ {
|
|
||||||
+ QPen wavePen = pen;
|
|
||||||
+ wavePen.setCapStyle(Qt::RoundCap);
|
|
||||||
+ wavePen.setJoinStyle(Qt::RoundJoin);
|
|
||||||
+ wavePen.setWidthF(1 * factor);
|
|
||||||
+
|
|
||||||
+ QPainter imgPainter(&pixmap);
|
|
||||||
+ imgPainter.setPen(std::move(wavePen));
|
|
||||||
+ imgPainter.setRenderHint(QPainter::Antialiasing);
|
|
||||||
+ imgPainter.translate(0, descent - (kMarkerHeight * factor));
|
|
||||||
+ imgPainter.drawPath(std::move(path));
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+ QPixmapCache::insert(std::move(key), pixmap);
|
|
||||||
+
|
|
||||||
+ return pixmap;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const QFontEngine *fe, QTextEngine *textEngine,
|
|
||||||
QTextCharFormat::UnderlineStyle underlineStyle,
|
|
||||||
QTextItem::RenderFlags flags, qreal width,
|
|
||||||
@@ -6262,7 +6347,9 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const
|
|
||||||
pen.setWidthF(fe->lineThickness().toReal());
|
|
||||||
pen.setCapStyle(Qt::FlatCap);
|
|
||||||
|
|
||||||
- QLineF line(qFloor(pos.x()), pos.y(), qFloor(pos.x() + width), pos.y());
|
|
||||||
+ // Patch: Improved underline with SpellCheck style for macOS and Windows.
|
|
||||||
+ // Slightly move the beginning of the underline to the right.
|
|
||||||
+ QLineF line(qFloor(pos.x() + 1), pos.y(), qFloor(pos.x() + width), pos.y());
|
|
||||||
|
|
||||||
bool wasCompatiblePainting = painter->renderHints()
|
|
||||||
& QPainter::Qt4CompatiblePainting;
|
|
||||||
@@ -6273,13 +6360,29 @@ static void drawTextItemDecoration(QPainter *painter, const QPointF &pos, const
|
|
||||||
const qreal underlineOffset = fe->underlinePosition().toReal();
|
|
||||||
|
|
||||||
if (underlineStyle == QTextCharFormat::SpellCheckUnderline) {
|
|
||||||
- QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme();
|
|
||||||
- if (theme)
|
|
||||||
- underlineStyle = QTextCharFormat::UnderlineStyle(theme->themeHint(QPlatformTheme::SpellCheckUnderlineStyle).toInt());
|
|
||||||
- if (underlineStyle == QTextCharFormat::SpellCheckUnderline) // still not resolved
|
|
||||||
- underlineStyle = QTextCharFormat::WaveUnderline;
|
|
||||||
- }
|
|
||||||
+ const qreal fontFactor = qreal(charFormat.font().pixelSize()) / qreal(10.);
|
|
||||||
+ painter->save();
|
|
||||||
+ painter->translate(0, pos.y() + 1);
|
|
||||||
+ const qreal maxHeight = fe->descent().toReal() - qreal(1);
|
|
||||||
+
|
|
||||||
+ QColor uc = charFormat.underlineColor();
|
|
||||||
+ if (uc.isValid())
|
|
||||||
+ pen.setColor(uc);
|
|
||||||
|
|
||||||
+ const QPixmap wave = generateChromeSpellcheckPixmap(maxHeight, fontFactor, pen);
|
|
||||||
+ const int descent = qFloor(maxHeight);
|
|
||||||
+
|
|
||||||
+ painter->setBrushOrigin(painter->brushOrigin().x(), 0);
|
|
||||||
+#ifdef Q_OS_MAC
|
|
||||||
+ const auto h = wave.height() / 2;
|
|
||||||
+ painter->drawTiledPixmap(
|
|
||||||
+ QRectF(pos.x(), (descent - h) / 2., qCeil(width), h),
|
|
||||||
+ wave);
|
|
||||||
+#else
|
|
||||||
+ painter->fillRect(pos.x(), 0, qCeil(width), descent, wave);
|
|
||||||
+#endif
|
|
||||||
+ painter->restore();
|
|
||||||
+ } else
|
|
||||||
if (underlineStyle == QTextCharFormat::WaveUnderline) {
|
|
||||||
painter->save();
|
|
||||||
painter->translate(0, pos.y() + 1);
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user