From 87c11a384af7ea474246780c98b221ef28a69a18 Mon Sep 17 00:00:00 2001 From: Mentalflow <312902918@qq.com> Date: Wed, 10 Apr 2024 10:52:27 +0800 Subject: [PATCH] RibbonTitleBar, RibbonTabPage: Improved UI. --- lib_source/qml/RibbonTabPage.qml | 3 ++- lib_source/qml/RibbonTitleBar.qml | 2 +- lib_source/ribbonui.cpp | 7 ++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib_source/qml/RibbonTabPage.qml b/lib_source/qml/RibbonTabPage.qml index af6a951..17c23d7 100644 --- a/lib_source/qml/RibbonTabPage.qml +++ b/lib_source/qml/RibbonTabPage.qml @@ -12,7 +12,8 @@ Item { anchors.fill: parent ScrollBar.horizontal: RibbonScrollBar{ anchors.bottom: view.bottom - width: view.width + anchors.horizontalCenter: view.horizontalCenter + width: view.width - 10 } RowLayout{ id: container diff --git a/lib_source/qml/RibbonTitleBar.qml b/lib_source/qml/RibbonTitleBar.qml index ffde36a..e1c012f 100644 --- a/lib_source/qml/RibbonTitleBar.qml +++ b/lib_source/qml/RibbonTitleBar.qml @@ -13,7 +13,7 @@ Item { property bool show_pin_btn: true property bool dark_mode: RibbonTheme.dark_mode property bool modern_style: RibbonTheme.modern_style - property string title_color: modern_style ? Qt.platform.os === "windows" ? dark_mode ? "#141414" : "#F5F5F5" :"transparent" : dark_mode ? "#282828" : "#2C59B7" + property string title_color: modern_style ? "transparent" : dark_mode ? "#282828" : "#2C59B7" property string title_text_color: modern_style ? dark_mode ? "white" : "black" : "white" default property alias content: left_container.data property alias left_content: left_container.data diff --git a/lib_source/ribbonui.cpp b/lib_source/ribbonui.cpp index 8bd73c5..bed4ad4 100644 --- a/lib_source/ribbonui.cpp +++ b/lib_source/ribbonui.cpp @@ -28,8 +28,13 @@ void RibbonUI::init() { qputenv("QT_QUICK_CONTROLS_STYLE","Basic"); FramelessHelper::Quick::initialize(); - FramelessConfig::instance()->set(Global::Option::ForceHideWindowFrameBorder); +#ifdef Q_OS_WINDOWS + FramelessConfig::instance()->set(Global::Option::ForceNonNativeBackgroundBlur); FramelessConfig::instance()->set(Global::Option::DisableLazyInitializationForMicaMaterial); + if(QOperatingSystemVersion::current() < QOperatingSystemVersion(QOperatingSystemVersion::Windows, 10, 0, 22000)) + FramelessConfig::instance()->set(Global::Option::WindowUseRoundCorners); +#endif + FramelessConfig::instance()->set(Global::Option::ForceHideWindowFrameBorder); FramelessConfig::instance()->set(Global::Option::CenterWindowBeforeShow); FramelessConfig::instance()->set(Global::Option::EnableBlurBehindWindow); }