diff --git a/CMakeLists.txt b/CMakeLists.txt index 63266e92..ac0f5861 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,6 @@ list(APPEND CMAKE_MODULE_PATH ${FLUENTUI_DIRECTORY}/.cmake/) include(GetGitRevisionDescription) option(FLUENTUI_BUILD_EXAMPLES "Build FluentUI demo applications." ON) -option(FLUENTUI_BUILD_FRAMELESSHEPLER "Build FramelessHelper." ON) option(FLUENTUI_BUILD_STATIC_LIB "Build static library." OFF) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core) @@ -32,15 +31,12 @@ if (FLUENTUI_BUILD_EXAMPLES) add_subdirectory(example) endif () -if (FLUENTUI_BUILD_FRAMELESSHEPLER) - set(FRAMELESSHELPER_BUILD_STATIC ON) - set(FRAMELESSHELPER_NO_DEBUG_OUTPUT ON) - set(FRAMELESSHELPER_BUILD_WIDGETS OFF) - add_subdirectory(framelesshelper) -endif () +set(FRAMELESSHELPER_BUILD_STATIC ON) +set(FRAMELESSHELPER_NO_DEBUG_OUTPUT ON) +set(FRAMELESSHELPER_BUILD_WIDGETS OFF) +add_subdirectory(framelesshelper) message("------------------------ FluentUI ------------------------") message("Build FluentUI demo applications.: ${FLUENTUI_BUILD_EXAMPLES}") -message("Build FramelessHelper.: ${FLUENTUI_BUILD_FRAMELESSHEPLER}") message("Build static library.: ${FLUENTUI_BUILD_STATIC_LIB}") message("Path to FluentUI plugin.: ${FLUENTUI_QML_PLUGIN_DIRECTORY}") diff --git a/example/qml-Qt6/component/CustomWindow.qml b/example/qml-Qt6/component/CustomWindow.qml deleted file mode 100644 index 588cc008..00000000 --- a/example/qml-Qt6/component/CustomWindow.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick -import QtQuick.Layouts -import FluentUI - -FluWindow { - id:window - property bool fixSize - property bool titleVisible: true - property bool appBarVisible: true - - function setHitTestVisible(com){ - } - function setTitleBarItem(com){ - } -} diff --git a/src/Qt5/imports/FluentUI/Controls/FluWindow.qml b/src/Qt5/imports/FluentUI/Controls/FluWindow.qml index 3ca47e8d..369aee15 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluWindow.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluWindow.qml @@ -31,7 +31,6 @@ Window { } } signal initArgument(var argument) - property bool showSystemAppBar: true id:window color:"transparent" Component.onCompleted: { @@ -168,7 +167,7 @@ Window { FramelessHelper{ id:framless_helper onReady: { - if(appBar && !showSystemAppBar){ + if(appBar){ var title_bar = loader_title_bar.item setTitleBarItem(title_bar) moveWindowToDesktopCenter() diff --git a/src/Qt6/imports/FluentUI/Controls/FluWindow.qml b/src/Qt6/imports/FluentUI/Controls/FluWindow.qml index 946ff13c..b0a5a9c2 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluWindow.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluWindow.qml @@ -30,7 +30,6 @@ Window { } } signal initArgument(var argument) - property bool showSystemAppBar: true id:window color:"transparent" Component.onCompleted: { @@ -167,7 +166,7 @@ Window { FramelessHelper{ id:framless_helper onReady: { - if(appBar && !showSystemAppBar){ + if(appBar){ var title_bar = loader_title_bar.item setTitleBarItem(title_bar) moveWindowToDesktopCenter()