46 lines
2.1 KiB
Diff
46 lines
2.1 KiB
Diff
From 501c510cc3cb6215aed27af7599395480a049667 Mon Sep 17 00:00:00 2001
|
|
From: Allan Sandfeld Jensen <allan.jensen@digia.com>
|
|
Date: Tue, 11 Nov 2014 13:48:27 +0100
|
|
Subject: [PATCH 009/131] Do not apply subpixel gamma-correction on XCB
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
To match rendering of subpixel antialiased text in Qt 4.8 and other
|
|
toolkits on X11, we should not apply gamma-correction. This also
|
|
makes the rendering of subpixel antialiased text closer to normal
|
|
antialiased text.
|
|
|
|
Task-number: QTBUG-41590
|
|
Change-Id: I45ad3448334951353657b878d002eea429858f2d
|
|
Reviewed-by: Samuel Rødal <srodal@gmail.com>
|
|
Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
|
|
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
|
|
---
|
|
src/plugins/platforms/xcb/qxcbintegration.cpp | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp
|
|
index cace087..3818494 100644
|
|
--- a/src/plugins/platforms/xcb/qxcbintegration.cpp
|
|
+++ b/src/plugins/platforms/xcb/qxcbintegration.cpp
|
|
@@ -427,12 +427,14 @@ QVariant QXcbIntegration::styleHint(QPlatformIntegration::StyleHint hint) const
|
|
case QPlatformIntegration::StartDragTime:
|
|
case QPlatformIntegration::KeyboardAutoRepeatRate:
|
|
case QPlatformIntegration::PasswordMaskDelay:
|
|
- case QPlatformIntegration::FontSmoothingGamma:
|
|
case QPlatformIntegration::StartDragVelocity:
|
|
case QPlatformIntegration::UseRtlExtensions:
|
|
case QPlatformIntegration::PasswordMaskCharacter:
|
|
// TODO using various xcb, gnome or KDE settings
|
|
break; // Not implemented, use defaults
|
|
+ case QPlatformIntegration::FontSmoothingGamma:
|
|
+ // Match Qt 4.8 text rendering, and rendering of other X11 toolkits.
|
|
+ return qreal(1.0);
|
|
case QPlatformIntegration::StartDragDistance: {
|
|
// The default (in QPlatformTheme::defaultThemeHint) is 10 pixels, but
|
|
// on a high-resolution screen it makes sense to increase it.
|
|
--
|
|
1.9.3
|
|
|