From 06d4cd2dab25e590883b25deae2da2fa7702c767 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 30 May 2020 11:57:30 +0400 Subject: [PATCH 1/3] Set style name always For some reason with kde platformtheme plugin DemiBold doesn't work Also use italic version of semibold font when needed --- ui/style/style_core_font.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ui/style/style_core_font.cpp b/ui/style/style_core_font.cpp index 4209fd4..391c565 100644 --- a/ui/style/style_core_font.cpp +++ b/ui/style/style_core_font.cpp @@ -322,8 +322,13 @@ FontData::FontData(int size, uint32 flags, int family, Font *other) f.setWeight(QFont::DemiBold); #else // DESKTOP_APP_USE_PACKAGED_FONTS f.setBold(true); - f.setStyleName("Semibold"); #endif // !DESKTOP_APP_USE_PACKAGED_FONTS + + if (_flags & FontItalic) { + f.setStyleName("Semibold Italic"); + } else { + f.setStyleName("Semibold"); + } } m = QFontMetrics(f); From e27395cf1878662f177f7aaea48a82e044da6b53 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 30 May 2020 11:59:22 +0400 Subject: [PATCH 2/3] Fix build with Qt 5.15 --- ui/effects/animation_value.h | 2 ++ ui/effects/cross_animation.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/ui/effects/animation_value.h b/ui/effects/animation_value.h index 46d76e4..0a7d226 100644 --- a/ui/effects/animation_value.h +++ b/ui/effects/animation_value.h @@ -10,6 +10,8 @@ #include "ui/style/style_core.h" +#include + namespace anim { enum class type { diff --git a/ui/effects/cross_animation.cpp b/ui/effects/cross_animation.cpp index 9860af7..61084d7 100644 --- a/ui/effects/cross_animation.cpp +++ b/ui/effects/cross_animation.cpp @@ -10,6 +10,7 @@ #include "ui/painter.h" #include +#include namespace Ui { namespace { From 6451ae50741a13b6b8e48835da654e24f34695aa Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 3 Jun 2020 09:05:13 +0400 Subject: [PATCH 3/3] Use Platform::IsWayland from lib_base --- ui/platform/linux/ui_utility_linux.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp index 4563f48..bab2e97 100644 --- a/ui/platform/linux/ui_utility_linux.cpp +++ b/ui/platform/linux/ui_utility_linux.cpp @@ -8,6 +8,7 @@ #include "base/flat_set.h" #include "ui/ui_log.h" +#include "base/platform/base_platform_info.h" #include #include @@ -22,7 +23,7 @@ bool IsApplicationActive() { } bool TranslucentWindowsSupported(QPoint globalPosition) { - if (QGuiApplication::platformName().startsWith("wayland", Qt::CaseInsensitive)) { + if (::Platform::IsWayland()) { return true; } if (const auto native = QGuiApplication::platformNativeInterface()) {