From bbcfa432a01db008ccd2af3ed9e315b90888aea4 Mon Sep 17 00:00:00 2001 From: Igor Korsukov Date: Tue, 6 Aug 2024 08:56:39 +0200 Subject: [PATCH 1/3] set fontengine=directwrite for Windows --- src/app/configs/qt_win.conf | 3 ++- src/framework/ui/api/themeapi.cpp | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/configs/qt_win.conf b/src/app/configs/qt_win.conf index 99c707827928b..36400fe1e23a3 100644 --- a/src/app/configs/qt_win.conf +++ b/src/app/configs/qt_win.conf @@ -2,4 +2,5 @@ Prefix=./ [Platforms] -WindowsArguments = fontengine=freetype +#WindowsArguments = fontengine=freetype +WindowsArguments = fontengine=directwrite diff --git a/src/framework/ui/api/themeapi.cpp b/src/framework/ui/api/themeapi.cpp index 380c372a4ff2c..896f36bc262fc 100644 --- a/src/framework/ui/api/themeapi.cpp +++ b/src/framework/ui/api/themeapi.cpp @@ -393,13 +393,14 @@ void ThemeApi::setupUiFonts() { &m_titleBoldFont, { QFont::DemiBold, FontSizeType::TITLE } }, }; + QString family = QString::fromStdString(configuration()->fontFamily()); for (QFont* font : fonts.keys()) { - std::string family = configuration()->fontFamily(); + int size = configuration()->fontSize(fonts[font].sizeType); QFont::Weight weight = fonts[font].weight; font->setPixelSize(size); - font->setFamily(QString::fromStdString(family)); + font->setFamily(family); font->setWeight(weight); } From 233f11477740bfda8cb55dd25f0a67e19155c69b Mon Sep 17 00:00:00 2001 From: Igor Korsukov Date: Wed, 7 Aug 2024 07:39:29 +0200 Subject: [PATCH 2/3] set Antialiasin for Windows --- src/framework/ui/api/themeapi.cpp | 1 - src/framework/uicomponents/view/quickpaintedview.cpp | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/framework/ui/api/themeapi.cpp b/src/framework/ui/api/themeapi.cpp index 896f36bc262fc..56f026417c1d5 100644 --- a/src/framework/ui/api/themeapi.cpp +++ b/src/framework/ui/api/themeapi.cpp @@ -395,7 +395,6 @@ void ThemeApi::setupUiFonts() QString family = QString::fromStdString(configuration()->fontFamily()); for (QFont* font : fonts.keys()) { - int size = configuration()->fontSize(fonts[font].sizeType); QFont::Weight weight = fonts[font].weight; diff --git a/src/framework/uicomponents/view/quickpaintedview.cpp b/src/framework/uicomponents/view/quickpaintedview.cpp index c079bb7d9c5b7..9b4209fcd775f 100644 --- a/src/framework/uicomponents/view/quickpaintedview.cpp +++ b/src/framework/uicomponents/view/quickpaintedview.cpp @@ -26,9 +26,14 @@ using namespace muse::uicomponents; QuickPaintedView::QuickPaintedView(QQuickItem* parent) : QQuickPaintedItem(parent) { +#ifdef Q_OS_WIN + setAntialiasing(true); + setSmooth(true); +#else //! NOTE It is necessary that when UI scaling is displayed without a blur setAntialiasing(false); setSmooth(false); +#endif } QSGNode* QuickPaintedView::updatePaintNode(QSGNode* old, UpdatePaintNodeData* data) From 4a37afa0d2bc8e902f41efc8c8dc92d9c3e05243 Mon Sep 17 00:00:00 2001 From: Igor Date: Thu, 26 Sep 2024 11:02:45 +0200 Subject: [PATCH 3/3] set fontengine=directwrite for Windows, antialiasin=false --- src/framework/uicomponents/view/quickpaintedview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/framework/uicomponents/view/quickpaintedview.cpp b/src/framework/uicomponents/view/quickpaintedview.cpp index 9b4209fcd775f..525108fea19c8 100644 --- a/src/framework/uicomponents/view/quickpaintedview.cpp +++ b/src/framework/uicomponents/view/quickpaintedview.cpp @@ -27,7 +27,7 @@ QuickPaintedView::QuickPaintedView(QQuickItem* parent) : QQuickPaintedItem(parent) { #ifdef Q_OS_WIN - setAntialiasing(true); + setAntialiasing(false); setSmooth(true); #else //! NOTE It is necessary that when UI scaling is displayed without a blur