kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Merge remote-tracking branch 'tdesktop/master' into v2.1.2

Browse source
This commit is contained in:
Ilya Fedin 2020-05-05 17:34:45 +04:00
commit a76cb8e35e
4 changed files with 40 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
fonts/DAOpenSansSemibold.ttf
View file

Binary file not shown.

BIN
fonts/DAOpenSansSemiboldItalic.ttf
View file

Binary file not shown.

1
ui/platform/mac/ui_utility_mac.mm
View file

@ -41,6 +41,7 @@ void InitOnTopPanel(not_null<QWidget*> panel) {
Assert([platformWindow isKindOfClass:[NSPanel class]]);
auto platformPanel = static_cast<NSPanel*>(platformWindow);
[platformPanel setBackgroundColor:[NSColor clearColor]];
[platformPanel setLevel:NSModalPanelWindowLevel];
[platformPanel setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces|NSWindowCollectionBehaviorStationary|NSWindowCollectionBehaviorFullScreenAuxiliary|NSWindowCollectionBehaviorIgnoresCycle];
[platformPanel setHidesOnDeactivate:NO];

47
ui/style/style_core_font.cpp
View file

@ -125,19 +125,17 @@ bool LoadCustomFont(const QString &filePath, const QString &familyName, int flag
return ValidateFont(familyName, flags);
}
QString MonospaceFont() {
static const auto family = [&]() -> QString {
const auto tryFont = [&](const QString &attempt) {
const auto resolved = QFontInfo(QFont(attempt)).family();
return !resolved.trimmed().compare(attempt, Qt::CaseInsensitive);
};
if (tryFont(CustomMonospaceFont)) {
return CustomMonospaceFont;
[[nodiscard]] QString SystemMonospaceFont() {
const auto type = QFontDatabase::FixedFont;
return QFontDatabase::systemFont(type).family();
}
#ifndef Q_OS_LINUX
if (!UseSystemFont) {
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>{
"Consolas",
"Liberation Mono",
@ -145,15 +143,32 @@ QString MonospaceFont() {
"Courier"
};
for (const auto &family : kTryFirst) {
if (tryFont(family)) {
if (TryFont(family)) {
return family;
}
}
return QString();
}
#endif // !Q_OS_LINUX
const auto type = QFontDatabase::FixedFont;
return QFontDatabase::systemFont(type).family();
QString MonospaceFont() {
static const auto family = [&]() -> QString {
if (TryFont(CustomMonospaceFont)) {
return CustomMonospaceFont;
}
const auto manual = ManualMonospaceFont();
const auto system = SystemMonospaceFont();
#if defined Q_OS_WIN || defined Q_OS_MAC
// Prefer our monospace font.
const auto useSystem = manual.isEmpty();
#else // Q_OS_WIN || Q_OS_MAC
// Prefer system monospace font.
const auto metrics = QFontMetrics(QFont(system));
const auto useSystem = manual.isEmpty()
|| (metrics.charWidth("i", 0) == metrics.charWidth("W", 0));
#endif // Q_OS_WIN || Q_OS_MAC
return (useSystem || UseSystemFont) ? system : manual;
}();
return family;
@ -367,7 +382,7 @@ FontData::FontData(int size, uint32 flags, int family, Font *other)
f.setStrikeOut(_flags & FontStrikeOut);
if (_flags & FontSemibold) {
if (CustomSemiboldIsBold) {
if (CustomSemiboldIsBold || fontOverride.startsWith("DAOpenSansSemibold")) {
f.setBold(true);
#ifdef DESKTOP_APP_USE_PACKAGED_FONTS
} else {