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

QFontComboBox: Minor code optimization & simplification

Browse Source 
Change-Id: If536a0b8721bdc562b505fc94a9fe4f77cc619de
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Konstantin Ritt 2013-03-07 12:53:54 +02:00 committed by The Qt Project
parent b80d130a51
commit 3cd94fcaf8
1 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/widgets/widgets/qfontcombobox.cpp
View File

@ -56,46 +56,33 @@ QT_BEGIN_NAMESPACE
static QFontDatabase::WritingSystem writingSystemForFont(const QFont &font, bool *hasLatin)
{
*hasLatin = true;
QList<QFontDatabase::WritingSystem> writingSystems = QFontDatabase().writingSystems(font.family());
// qDebug() << font.family() << writingSystems;
// this just confuses the algorithm below. Vietnamese is Latin with lots of special chars
writingSystems.removeAll(QFontDatabase::Vietnamese);
QFontDatabase::WritingSystem system = QFontDatabase::Any;
if (!writingSystems.contains(QFontDatabase::Latin)) {
*hasLatin = false;
// we need to show something
if (writingSystems.count())
system = writingSystems.last();
} else {
writingSystems.removeAll(QFontDatabase::Latin);
}
writingSystems.removeOne(QFontDatabase::Vietnamese);
*hasLatin = writingSystems.removeOne(QFontDatabase::Latin);
if (writingSystems.isEmpty())
return system;
return QFontDatabase::Any;
if (writingSystems.count() == 1 && writingSystems.at(0) > QFontDatabase::Cyrillic) {
system = writingSystems.at(0);
QFontDatabase::WritingSystem system = writingSystems.last();
if (!*hasLatin) {
// we need to show something
return system;
}
if (writingSystems.count() <= 2
&& writingSystems.last() > QFontDatabase::Armenian
&& writingSystems.last() < QFontDatabase::Vietnamese) {
system = writingSystems.last();
if (writingSystems.count() == 1 && system > QFontDatabase::Cyrillic)
return system;
}
if (writingSystems.count() <= 5
&& writingSystems.last() >= QFontDatabase::SimplifiedChinese
&& writingSystems.last() <= QFontDatabase::Korean)
system = writingSystems.last();
if (writingSystems.count() <= 2 && system > QFontDatabase::Armenian && system < QFontDatabase::Vietnamese)
return system;
return system;
if (writingSystems.count() <= 5 && system >= QFontDatabase::SimplifiedChinese && system <= QFontDatabase::Korean)
return system;
return QFontDatabase::Any;
}
class QFontFamilyDelegate : public QAbstractItemDelegate