AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sorting of fallback fonts based on writing systems

Browse Source 
Now qt_sort_families_by_writing_system checks all writing systems for sc
ript. This makes Japanese text look properly on macOS.

Task-number: QTBUG-81924
Change-Id: Id2a149eb84c5992414505b079be4e707f7f8c6c7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
This commit is contained in:
Hikaru Terazono (3c1u) 2020-02-08 22:20:21 +09:00
parent f9802b2fb1
commit 243f4b2a8c
1 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/gui/text/qfontdatabase.cpp
View File

@ -826,7 +826,19 @@ QStringList QPlatformFontDatabase::fallbacksForFamily(const QString &family, QFo
f->ensurePopulated();
if (writingSystem > QFontDatabase::Any && f->writingSystems[writingSystem] != QtFontFamily::Supported)
size_t otherWritingSystem = writingSystem;
while (writingSystem > QFontDatabase::Any && f->writingSystems[otherWritingSystem] != QtFontFamily::Supported) {
otherWritingSystem = std::find(scriptForWritingSystem + (otherWritingSystem + 1),
scriptForWritingSystem + QFontDatabase::WritingSystemsCount,
script) - scriptForWritingSystem;
if (otherWritingSystem >= QFontDatabase::WritingSystemsCount) {
break;
}
}
if (otherWritingSystem >= QFontDatabase::WritingSystemsCount)
continue;
for (int j = 0; j < f->count; ++j) {
@ -2857,9 +2869,10 @@ QString QFontDatabase::resolveFontFamilyAlias(const QString &family)
Q_GUI_EXPORT QStringList qt_sort_families_by_writing_system(QChar::Script script, const QStringList &families)
{
size_t writingSystem = std::find(scriptForWritingSystem,
scriptForWritingSystem + QFontDatabase::WritingSystemsCount,
script) - scriptForWritingSystem;
const size_t writingSystem =
std::find(scriptForWritingSystem,
scriptForWritingSystem + QFontDatabase::WritingSystemsCount, script)
- scriptForWritingSystem;
if (writingSystem == QFontDatabase::Any
|| writingSystem >= QFontDatabase::WritingSystemsCount) {
return families;
@ -2879,9 +2892,30 @@ Q_GUI_EXPORT QStringList qt_sort_families_by_writing_system(QChar::Script script
}
}
bool isSupported = false;
if (testFamily != nullptr) {
isSupported = testFamily->writingSystems[writingSystem] & QtFontFamily::Supported;
auto otherWritingSystem = writingSystem;
// test other writing systems
while (!isSupported) {
otherWritingSystem =
std::find(&scriptForWritingSystem[otherWritingSystem + 1],
scriptForWritingSystem + QFontDatabase::WritingSystemsCount,
script)
- scriptForWritingSystem;
if (otherWritingSystem >= QFontDatabase::WritingSystemsCount)
break;
isSupported |=
testFamily->writingSystems[otherWritingSystem] & QtFontFamily::Supported;
}
}
uint order = i;
if (testFamily == nullptr
|| (testFamily->writingSystems[writingSystem] & QtFontFamily::Supported) == 0) {
if (!isSupported) {
order |= 1u << 31;
}