Skip to content

Commit 9f449ff

Browse files
committed
QPA: enable hinting slight for subpixel only
1 parent 1fbc23c commit 9f449ff

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

platforms/qhaikuplatform/haiku/qhaikuintegration.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,18 @@ void QHaikuIntegration::setAntialiasingMethod(bool subpixel)
124124
}
125125
}
126126

127-
void QHaikuIntegration::setHinting(uint8 hinting)
127+
void QHaikuIntegration::setHinting(uint8 hinting, bool subpixel)
128128
{
129129
if (hinting > 0) {
130130
QDir dir("/system/settings/fonts/conf.d/", {"10-hinting-*.conf"});
131131
for (const QString & filename: dir.entryList()) {
132132
if (filename != "10-hinting-slight.conf")
133133
dir.remove(filename);
134134
}
135-
symlink("/system/data/fontconfig/conf.avail/10-hinting-slight.conf",
136-
"/system/settings/fonts/conf.d/10-hinting-slight.conf");
135+
if (subpixel) {
136+
symlink("/system/data/fontconfig/conf.avail/10-hinting-slight.conf",
137+
"/system/settings/fonts/conf.d/10-hinting-slight.conf");
138+
}
137139
} else {
138140
QDir dir("/system/settings/fonts/conf.d/", {"10-hinting-*.conf"});
139141
for (const QString & filename: dir.entryList()) {
@@ -322,7 +324,7 @@ QHaikuIntegration *QHaikuIntegration::createHaikuIntegration(const QStringList&
322324
get_hinting_mode(&hinting);
323325
get_subpixel_antialiasing(&subpixel);
324326
setAntialiasingMethod(subpixel);
325-
setHinting(hinting);
327+
setHinting(hinting, subpixel);
326328
setenv("FONTCONFIG_PATH", "/system/settings/fonts", 0);
327329

328330
QHaikuIntegration *newHaikuIntegration = new QHaikuIntegration(parameters, argc, argv);

platforms/qhaikuplatform/haiku/qhaikuintegration.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class QHaikuIntegration : public QObject, public QPlatformIntegration
116116
private:
117117
static int32 haikuApplicationThread(void *data);
118118
static void setAntialiasingMethod(bool subpixel);
119-
static void setHinting(uint8 hinting);
119+
static void setHinting(uint8 hinting, bool subpixel);
120120
static bool isOpenGLEnabled();
121121

122122
QPlatformFontDatabase *m_fontDatabase;

0 commit comments

Comments
 (0)