From 7fe71c892b1fcbea2393360a8ec8a8bcfc34d2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Sun, 13 Aug 2023 20:49:04 +0800 Subject: [PATCH] update --- CMakeLists.txt | 6 +----- src/imports/FluentUI/Controls/FluWindow.qml | 13 +++++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d7d3d93..b681b3fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,11 +25,7 @@ endif () if (FLUENTUI_BUILD_FRAMELESSHEPLER) set(FRAMELESSHELPER_BUILD_STATIC ON) - set(FRAMELESSHELPER_NO_SUMMARY OFF) - set(FRAMELESSHELPER_NO_DEBUG_OUTPUT OFF) - set(FRAMELESSHELPER_BUILD_WIDGETS OFF) - add_definitions(-DFRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT) - add_definitions(-DFRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT) + set(FRAMELESSHELPER_NO_DEBUG_OUTPUT ON) add_subdirectory(framelesshelper) endif () diff --git a/src/imports/FluentUI/Controls/FluWindow.qml b/src/imports/FluentUI/Controls/FluWindow.qml index 5262bb1e..7433f6ff 100644 --- a/src/imports/FluentUI/Controls/FluWindow.qml +++ b/src/imports/FluentUI/Controls/FluWindow.qml @@ -10,6 +10,12 @@ Window { property var argument:({}) property var background : com_background property Component loadingItem: com_loading + property color backgroundColor: { + if(active){ + return FluTheme.dark ? Qt.rgba(26/255,34/255,40/255,1) : Qt.rgba(238/255,244/255,249/255,1) + } + return FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1) + } property var _pageRegister property string _route property var closeFunc: function(event){ @@ -34,12 +40,7 @@ Window { Component{ id:com_background Rectangle{ - color: { - if(active){ - return FluTheme.dark ? Qt.rgba(26/255,34/255,40/255,1) : Qt.rgba(238/255,244/255,249/255,1) - } - return FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1) - } + color: window.backgroundColor } } Loader{