kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Eric Kotato 2020-06-03 11:57:47 +03:00
commit bb182bbf5d
4 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ui/effects/animation_value.h
View file

@ -10,6 +10,8 @@
#include "ui/style/style_core.h" #include "ui/style/style_core.h"
#include <QtGui/QPainterPath>
namespace anim { namespace anim {
enum class type { enum class type {

1
ui/effects/cross_animation.cpp
View file

@ -10,6 +10,7 @@
#include "ui/painter.h" #include "ui/painter.h"
#include <QtCore/QtMath> #include <QtCore/QtMath>
#include <QtGui/QPainterPath>
namespace Ui { namespace Ui {
namespace { namespace {

3
ui/platform/linux/ui_utility_linux.cpp
View file

@ -8,6 +8,7 @@
#include "base/flat_set.h" #include "base/flat_set.h"
#include "ui/ui_log.h" #include "ui/ui_log.h"
#include "base/platform/base_platform_info.h"
#include <QtCore/QPoint> #include <QtCore/QPoint>
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
@ -22,7 +23,7 @@ bool IsApplicationActive() {
} }
bool TranslucentWindowsSupported(QPoint globalPosition) { bool TranslucentWindowsSupported(QPoint globalPosition) {
if (QGuiApplication::platformName().startsWith("wayland", Qt::CaseInsensitive)) { if (::Platform::IsWayland()) {
return true; return true;
} }
if (const auto native = QGuiApplication::platformNativeInterface()) { if (const auto native = QGuiApplication::platformNativeInterface()) {

6
ui/style/style_core_font.cpp
View file

@ -412,6 +412,12 @@ FontData::FontData(int size, uint32 flags, int family, Font *other)
f.setStyleName("Semibold"); f.setStyleName("Semibold");
#endif // !DESKTOP_APP_USE_PACKAGED_FONTS #endif // !DESKTOP_APP_USE_PACKAGED_FONTS
} }
if (_flags & FontItalic) {
f.setStyleName("Semibold Italic");
} else {
f.setStyleName("Semibold");
}
} }
if (IsRealSemibold(fontOverride)) { if (IsRealSemibold(fontOverride)) {