kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

[Option][GUI] Font options

Browse source
This commit is contained in:
Eric Kotato 2022-09-15 23:17:03 +03:00 • committed by Eric Kotato
parent 48dd843cf0
commit f72187a321
8 changed files with 169 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ui/integration.cpp
View file

@ -6,6 +6,7 @@
//
#include "ui/integration.h"
#include "ui/style/style_core_custom_font.h"
#include "ui/gl/gl_detection.h"
#include "ui/text/text_entity.h"
#include "ui/text/text_block.h"
@ -44,6 +45,10 @@ void Integration::textActionsUpdated() {
void Integration::activationFromTopPanel() {
}
style::CustomFontSettings Integration::fontSettings() {
return {};
}
bool Integration::screenIsLocked() {
return false;
}

6
ui/integration.h
View file

@ -23,6 +23,10 @@ class ClickHandler;
struct ClickContext;
struct EntityLinkData;
namespace style {
struct CustomFontSettings;
} // namespace style
namespace Ui {
namespace Emoji {
class One;
@ -49,6 +53,8 @@ public:
virtual void textActionsUpdated();
virtual void activationFromTopPanel();
virtual style::CustomFontSettings fontSettings();
[[nodiscard]] virtual bool screenIsLocked();
[[nodiscard]] virtual std::shared_ptr<ClickHandler> createLinkHandler(

11
ui/painter.h
View file

@ -22,13 +22,15 @@ public:
void drawTextLeft(int x, int y, int outerw, const QString &text, int textWidth = -1) {
QFontMetrics m(fontMetrics());
auto ascent = (_ascent == 0 ? m.ascent() : _ascent);
if (style::RightToLeft() && textWidth < 0) textWidth = m.horizontalAdvance(text);
drawText(style::RightToLeft() ? (outerw - x - textWidth) : x, y + m.ascent(), text);
drawText(style::RightToLeft() ? (outerw - x - textWidth) : x, y + ascent, text);
}
void drawTextRight(int x, int y, int outerw, const QString &text, int textWidth = -1) {
QFontMetrics m(fontMetrics());
auto ascent = (_ascent == 0 ? m.ascent() : _ascent);
if (!style::RightToLeft() && textWidth < 0) textWidth = m.horizontalAdvance(text);
drawText(style::RightToLeft() ? x : (outerw - x - textWidth), y + m.ascent(), text);
drawText(style::RightToLeft() ? x : (outerw - x - textWidth), y + ascent, text);
}
void drawPixmapLeft(int x, int y, int outerw, const QPixmap &pix, const QRect &from) {
drawPixmap(QPoint(style::RightToLeft() ? (outerw - x - (from.width() / pix.devicePixelRatio())) : x, y), pix, from);
@ -82,6 +84,10 @@ public:
[[nodiscard]] bool inactive() const {
return _inactive;
}
void setFont(const style::font &font) {
_ascent = font->ascent;
QPainter::setFont(font->f);
}
void setTextSpoilerMess(not_null<Ui::Text::SpoilerMess*> mess) {
_spoilerMess = mess;
}
@ -96,6 +102,7 @@ private:
const style::TextPalette *_textPalette = nullptr;
Ui::Text::SpoilerMess *_spoilerMess = nullptr;
bool _inactive = false;
int _ascent = 0;
};

36
ui/style/style_core_custom_font.cpp
View file

@ -7,6 +7,8 @@
#include "ui/style/style_core_custom_font.h"
#include "ui/style/style_core_font.h"
#include "ui/style/style_core_scale.h"
#include "ui/integration.h"
#include <QGuiApplication>
#include <QFontDatabase>
@ -29,6 +31,9 @@ void SetCustomFonts(const CustomFont &regular, const CustomFont &bold) {
QFont ResolveFont(const QString &familyOverride, uint32 flags, int size) {
static auto Database = QFontDatabase();
const auto fontSettings = Ui::Integration::Instance().fontSettings();
const auto overrideIsEmpty = GetPossibleEmptyOverride(flags).isEmpty();
const auto bold = ((flags & FontBold) || (flags & FontSemibold));
const auto italic = (flags & FontItalic);
const auto &custom = bold ? BoldFont : RegularFont;
@ -50,18 +55,29 @@ QFont ResolveFont(const QString &familyOverride, uint32 flags, int size) {
const auto point = good.isEmpty() ? size : good.front();
result = Database.font(custom.family, custom.style, point);
} else {
result.setFamily(GetFontOverride(flags));
if (!fontSettings.useSystemFont || !overrideIsEmpty) {
result.setFamily(GetFontOverride(flags));
}
if (bold) {
if (fontSettings.semiboldIsBold) {
result.setBold(true);
#ifdef LIB_UI_USE_PACKAGED_FONTS
result.setWeight(QFont::DemiBold);
#else // LIB_UI_USE_PACKAGED_FONTS
result.setBold(true);
#endif // !LIB_UI_USE_PACKAGED_FONTS
if (flags & FontItalic) {
result.setStyleName("Semibold Italic");
} else {
result.setStyleName("Semibold");
result.setWeight(QFont::DemiBold);
#else // LIB_UI_USE_PACKAGED_FONTS
} else if (fontSettings.useSystemFont) {
result.setWeight(QFont::DemiBold);
} else {
result.setBold(true);
#endif // !LIB_UI_USE_PACKAGED_FONTS
}
if (!fontSettings.semiboldIsBold) {
if (flags & FontItalic) {
result.setStyleName("Semibold Italic");
} else {
result.setStyleName("Semibold");
}
}
}
}
@ -71,7 +87,7 @@ QFont ResolveFont(const QString &familyOverride, uint32 flags, int size) {
result.setUnderline(flags & FontUnderline);
result.setStrikeOut(flags & FontStrikeOut);
result.setPixelSize(size);
result.setPixelSize(size + ConvertScale(fontSettings.fontSize));
return result;
}

10
ui/style/style_core_custom_font.h
View file

@ -13,6 +13,16 @@ struct CustomFont {
QString style;
};
struct CustomFontSettings {
QString mainFont;
QString semiboldFont;
QString monospaceFont;
int fontSize = 0;
bool semiboldIsBold = false;
bool useSystemFont = false;
bool useOriginalMetrics = false;
};
inline bool operator==(const CustomFont &a, const CustomFont &b) {
return (a.family == b.family) && (a.style == b.style);
}

132
ui/style/style_core_font.cpp
View file

@ -102,6 +102,11 @@ bool LoadCustomFont(const QString &filePath, const QString &familyName, int flag
return QFontDatabase::systemFont(type).family();
}
bool TryFont(const QString &attempt) {
const auto resolved = QFontInfo(QFont(attempt)).family();
return !resolved.trimmed().compare(attempt, Qt::CaseInsensitive);
}
[[nodiscard]] QString ManualMonospaceFont() {
const auto kTryFirst = std::initializer_list<QString>{
"Cascadia Mono",
@ -111,14 +116,23 @@ bool LoadCustomFont(const QString &filePath, const QString &familyName, int flag
"Courier"
};
for (const auto &family : kTryFirst) {
const auto resolved = QFontInfo(QFont(family)).family();
if (!resolved.trimmed().compare(family, Qt::CaseInsensitive)) {
if (TryFont(family)) {
return family;
}
}
return QString();
}
QFontMetrics GetFontMetrics(int size) {
#ifdef DESKTOP_APP_USE_PACKAGED_FONTS
QFont originalFont("Open Sans");
#else // !DESKTOP_APP_USE_PACKAGED_FONTS
QFont originalFont("DAOpenSansRegular");
#endif // !DESKTOP_APP_USE_PACKAGED_FONTS
originalFont.setPixelSize(size);
return QFontMetrics(originalFont);
}
enum {
FontTypeRegular = 0,
FontTypeRegularItalic,
@ -185,56 +199,76 @@ void StartFonts() {
style_InitFontsResource();
#ifndef LIB_UI_USE_PACKAGED_FONTS
[[maybe_unused]] bool areGood[FontTypesCount] = { false };
for (auto i = 0; i != FontTypesCount; ++i) {
const auto file = FontTypeFiles[i];
const auto name = FontTypeNames[i];
const auto flags = FontTypeFlags[i];
areGood[i] = LoadCustomFont(":/gui/fonts/" + file + ".ttf", name, flags);
Overrides[i] = name;
const auto fontSettings = Ui::Integration::Instance().fontSettings();
const auto persianFallbackFile = FontTypePersianFallbackFiles[i];
const auto persianFallback = FontTypePersianFallback[i];
LoadCustomFont(":/gui/fonts/" + persianFallbackFile + ".ttf", persianFallback, flags);
#ifndef LIB_UI_USE_PACKAGED_FONTS
if (!fontSettings.useSystemFont) {
[[maybe_unused]] bool areGood[FontTypesCount] = { false };
for (auto i = 0; i != FontTypesCount; ++i) {
const auto file = FontTypeFiles[i];
const auto name = FontTypeNames[i];
const auto flags = FontTypeFlags[i];
areGood[i] = LoadCustomFont(":/gui/fonts/" + file + ".ttf", name, flags);
Overrides[i] = name;
const auto persianFallbackFile = FontTypePersianFallbackFiles[i];
const auto persianFallback = FontTypePersianFallback[i];
LoadCustomFont(":/gui/fonts/" + persianFallbackFile + ".ttf", persianFallback, flags);
#ifdef Q_OS_WIN
// Attempt to workaround a strange font bug with Open Sans Semibold not loading.
// See https://github.com/telegramdesktop/tdesktop/issues/3276 for details.
// Crash happens on "options.maxh / _t->_st->font->height" with "division by zero".
// In that place "_t->_st->font" is "semiboldFont" is "font(13 "Open Sans Semibold").
const auto fallback = "Segoe UI";
if (!areGood[i]) {
if (ValidateFont(fallback, flags)) {
Overrides[i] = fallback;
LOG(("Fonts Info: Using '%1' instead of '%2'.").arg(fallback).arg(name));
// Attempt to workaround a strange font bug with Open Sans Semibold not loading.
// See https://github.com/telegramdesktop/tdesktop/issues/3276 for details.
// Crash happens on "options.maxh / _t->_st->font->height" with "division by zero".
// In that place "_t->_st->font" is "semiboldFont" is "font(13 "Open Sans Semibold").
const auto fallback = "Segoe UI";
if (!areGood[i]) {
if (ValidateFont(fallback, flags)) {
Overrides[i] = fallback;
LOG(("Fonts Info: Using '%1' instead of '%2'.").arg(fallback).arg(name));
}
}
}
// Disable default fallbacks to Segoe UI, see:
// https://github.com/telegramdesktop/tdesktop/issues/5368
//
//QFont::insertSubstitution(name, fallback);
// Disable default fallbacks to Segoe UI, see:
// https://github.com/telegramdesktop/tdesktop/issues/5368
//
//QFont::insertSubstitution(name, fallback);
#endif // Q_OS_WIN
QFont::insertSubstitution(name, persianFallback);
}
QFont::insertSubstitution(name, persianFallback);
}
#ifdef Q_OS_MAC
auto list = QStringList();
list.append("STIXGeneral");
list.append(".SF NS Text");
list.append("Helvetica Neue");
list.append("Lucida Grande");
for (const auto &name : FontTypeNames) {
QFont::insertSubstitutions(name, list);
}
auto list = QStringList();
list.append("STIXGeneral");
list.append(".SF NS Text");
list.append("Helvetica Neue");
list.append("Lucida Grande");
for (const auto &name : FontTypeNames) {
QFont::insertSubstitutions(name, list);
}
#endif // Q_OS_MAC
}
#elif __has_include(<glib.h>) // !LIB_UI_USE_PACKAGED_FONTS
g_warning(
"Unable to load patched fonts with Qt workarounds, "
"expect font issues.");
#endif // LIB_UI_USE_PACKAGED_FONTS
if (!fontSettings.mainFont.isEmpty() && ValidateFont(fontSettings.mainFont)) {
Overrides[FontTypeRegular] = fontSettings.mainFont;
Overrides[FontTypeRegularItalic] = fontSettings.mainFont;
}
if (!fontSettings.semiboldFont.isEmpty() && ValidateFont(fontSettings.semiboldFont)) {
Overrides[FontTypeBold] = fontSettings.semiboldFont;
Overrides[FontTypeBoldItalic] = fontSettings.semiboldFont;
Overrides[FontTypeSemibold] = fontSettings.semiboldFont;
Overrides[FontTypeSemiboldItalic] = fontSettings.semiboldFont;
} else if (!fontSettings.mainFont.isEmpty() && ValidateFont(fontSettings.mainFont)) {
Overrides[FontTypeBold] = fontSettings.mainFont;
Overrides[FontTypeBoldItalic] = fontSettings.mainFont;
Overrides[FontTypeSemibold] = fontSettings.mainFont;
Overrides[FontTypeSemiboldItalic] = fontSettings.mainFont;
}
auto appFont = QApplication::font();
appFont.setStyleStrategy(QFont::PreferQuality);
QApplication::setFont(appFont);
@ -267,6 +301,12 @@ QString GetFontOverride(int32 flags) {
QString MonospaceFont() {
static const auto family = [&]() -> QString {
const auto fontSettings = Ui::Integration::Instance().fontSettings();
if (TryFont(fontSettings.monospaceFont)) {
return fontSettings.monospaceFont;
}
const auto manual = ManualMonospaceFont();
const auto system = SystemMonospaceFont();
@ -279,7 +319,7 @@ QString MonospaceFont() {
const auto useSystem = manual.isEmpty()
|| (metrics.horizontalAdvance(QChar('i')) == metrics.horizontalAdvance(QChar('W')));
#endif // Q_OS_WIN
return useSystem ? system : manual;
return (useSystem || fontSettings.useSystemFont) ? system : manual;
}();
return family;
@ -313,9 +353,19 @@ FontData::FontData(int size, uint32 flags, int family, Font *other)
}
_modified[_flags] = Font(this);
height = int(base::SafeRound(_m.height()));
ascent = int(base::SafeRound(_m.ascent()));
descent = int(base::SafeRound(_m.descent()));
const auto fontSettings = Ui::Integration::Instance().fontSettings();
if (fontSettings.useOriginalMetrics && !(_flags & FontMonospace)) {
const auto mOrig = GetFontMetrics(size);
height = int(base::SafeRound(mOrig.height()));
ascent = int(base::SafeRound(mOrig.ascent()));
descent = int(base::SafeRound(mOrig.descent()));
} else {
height = int(base::SafeRound(_m.height()));
ascent = int(base::SafeRound(_m.ascent()));
descent = int(base::SafeRound(_m.descent()));
}
spacew = width(QLatin1Char(' '));
elidew = width("...");
}

1
ui/style/style_core_font.h
View file

@ -17,6 +17,7 @@ namespace style {
namespace internal {
void StartFonts();
[[nodiscard]] QString GetPossibleEmptyOverride(int32 flags = 0);
[[nodiscard]] QString GetFontOverride(int32 flags = 0);
[[nodiscard]] QString MonospaceFont();

21
ui/widgets/fields/input_field.cpp
View file

@ -11,6 +11,7 @@
#include "ui/emoji_config.h"
#include "ui/ui_utility.h"
#include "ui/painter.h"
#include "ui/style/style_core_custom_font.h"
#include "base/invoke_queued.h"
#include "base/random.h"
#include "base/platform/base_platform_info.h"
@ -1243,6 +1244,14 @@ InputField::InputField(
_inner->viewport()->setAutoFillBackground(false);
_inner->setContentsMargins(0, 0, 0, 0);
const auto fontSettings = Integration::Instance().fontSettings();
if (fontSettings.useOriginalMetrics) {
const auto metrics = QFontMetricsF(_st.font->f);
const auto heightDelta = (_st.font->height - metrics.height());
const auto topMargin = (_st.font->ascent - metrics.ascent())
+ (heightDelta ? heightDelta / 2 : 0);
_inner->setViewportMargins(0, topMargin, 0, 0);
}
_inner->document()->setDocumentMargin(0);
setAttribute(Qt::WA_AcceptTouchEvents);
@ -1785,6 +1794,18 @@ void InputField::paintEvent(QPaintEvent *e) {
auto r = rect().marginsRemoved(_st.textMargins + _st.placeholderMargins);
r.moveLeft(r.left() + placeholderLeft);
if (style::RightToLeft()) r.moveLeft(width() - r.left() - r.width());
const auto fontSettings = Integration::Instance().fontSettings();
if (fontSettings.useOriginalMetrics) {
const auto metrics = QFontMetricsF(_st.placeholderFont->f);
if (_mode == Mode::SingleLine) {
const auto heightDelta = (_st.placeholderFont->height - metrics.height());
const auto topMargin = (_st.placeholderFont->ascent - metrics.ascent())
+ (heightDelta ? heightDelta / 2 : 0);
r.moveTop(r.top() + topMargin);
} else {
r.moveTop(r.top() + _st.placeholderFont->ascent - metrics.ascent());
}
}
p.drawText(r, _placeholder, _st.placeholderAlign);
}