From ed51143e9b3b4f864c4b7b19b2581263efdd60de Mon Sep 17 00:00:00 2001 From: zhuzihcu Date: Fri, 16 Jun 2023 12:25:50 +0800 Subject: [PATCH 1/2] update --- CMakeLists.txt | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24da5a30..40225c5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,21 @@ cmake_minimum_required(VERSION 3.20) project(FluentUI VERSION 0.1 LANGUAGES CXX) -add_subdirectory(src) -add_subdirectory(example) +option(FLUENTUI_BUILD_EXAMPLES "Build FluentUI demo applications." ON) +option(FLUENTUI_BUILD_FRAMELESSHEPLER "Build FramelessHelper." ON) -add_definitions(-DFRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT) -add_definitions(-DFRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT) -add_subdirectory(framelesshelper) +add_subdirectory(src) + +if (FLUENTUI_BUILD_EXAMPLES) + add_subdirectory(example) +endif () + +if (FLUENTUI_BUILD_FRAMELESSHEPLER) + add_definitions(-DFRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT) + add_definitions(-DFRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT) + add_subdirectory(framelesshelper) +endif () + +message("------------------------ FluentUI ------------------------") +message("Build FluentUI demo applications.: ${FLUENTUI_BUILD_EXAMPLES}") +message("Build FramelessHelper.: ${FLUENTUI_BUILD_FRAMELESSHEPLER}") From 24f28d894523eec63b6d849595baa5ee012c72d7 Mon Sep 17 00:00:00 2001 From: zhuzihcu Date: Fri, 16 Jun 2023 12:45:57 +0800 Subject: [PATCH 2/2] update --- src/imports/FluentUI/Controls/FluAppBar.qml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/imports/FluentUI/Controls/FluAppBar.qml b/src/imports/FluentUI/Controls/FluAppBar.qml index 8319e519..51e2c7ae 100644 --- a/src/imports/FluentUI/Controls/FluAppBar.qml +++ b/src/imports/FluentUI/Controls/FluAppBar.qml @@ -147,4 +147,8 @@ Rectangle{ return btn_close } + function darkButton(){ + return btn_dark + } + }