amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2025-01-23 04:14:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2023-10-08 19:59:55 +08:00
parent 1d68de9287
commit 17829bac69
4 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -8,7 +8,6 @@ list(APPEND CMAKE_MODULE_PATH ${FLUENTUI_DIRECTORY}/.cmake/)
include(GetGitRevisionDescription) include(GetGitRevisionDescription)
option(FLUENTUI_BUILD_EXAMPLES "Build FluentUI demo applications." ON) 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) option(FLUENTUI_BUILD_STATIC_LIB "Build static library." OFF)
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
@ -32,15 +31,12 @@ if (FLUENTUI_BUILD_EXAMPLES)
add_subdirectory(example) add_subdirectory(example)
endif () endif ()
if (FLUENTUI_BUILD_FRAMELESSHEPLER) set(FRAMELESSHELPER_BUILD_STATIC ON)
set(FRAMELESSHELPER_BUILD_STATIC ON) set(FRAMELESSHELPER_NO_DEBUG_OUTPUT ON)
set(FRAMELESSHELPER_NO_DEBUG_OUTPUT ON) set(FRAMELESSHELPER_BUILD_WIDGETS OFF)
set(FRAMELESSHELPER_BUILD_WIDGETS OFF) add_subdirectory(framelesshelper)
add_subdirectory(framelesshelper)
endif ()
message("------------------------ FluentUI ------------------------") message("------------------------ FluentUI ------------------------")
message("Build FluentUI demo applications.: ${FLUENTUI_BUILD_EXAMPLES}") message("Build FluentUI demo applications.: ${FLUENTUI_BUILD_EXAMPLES}")
message("Build FramelessHelper.: ${FLUENTUI_BUILD_FRAMELESSHEPLER}")
message("Build static library.: ${FLUENTUI_BUILD_STATIC_LIB}") message("Build static library.: ${FLUENTUI_BUILD_STATIC_LIB}")
message("Path to FluentUI plugin.: ${FLUENTUI_QML_PLUGIN_DIRECTORY}") message("Path to FluentUI plugin.: ${FLUENTUI_QML_PLUGIN_DIRECTORY}")

15
example/qml-Qt6/component/CustomWindow.qml
View File

@ -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){
}
}

3
src/Qt5/imports/FluentUI/Controls/FluWindow.qml
View File

@ -31,7 +31,6 @@ Window {
} }
} }
signal initArgument(var argument) signal initArgument(var argument)
property bool showSystemAppBar: true
id:window id:window
color:"transparent" color:"transparent"
Component.onCompleted: { Component.onCompleted: {
@ -168,7 +167,7 @@ Window {
FramelessHelper{ FramelessHelper{
id:framless_helper id:framless_helper
onReady: { onReady: {
if(appBar && !showSystemAppBar){ if(appBar){
var title_bar = loader_title_bar.item var title_bar = loader_title_bar.item
setTitleBarItem(title_bar) setTitleBarItem(title_bar)
moveWindowToDesktopCenter() moveWindowToDesktopCenter()

3
src/Qt6/imports/FluentUI/Controls/FluWindow.qml
View File

@ -30,7 +30,6 @@ Window {
} }
} }
signal initArgument(var argument) signal initArgument(var argument)
property bool showSystemAppBar: true
id:window id:window
color:"transparent" color:"transparent"
Component.onCompleted: { Component.onCompleted: {
@ -167,7 +166,7 @@ Window {
FramelessHelper{ FramelessHelper{
id:framless_helper id:framless_helper
onReady: { onReady: {
if(appBar && !showSystemAppBar){ if(appBar){
var title_bar = loader_title_bar.item var title_bar = loader_title_bar.item
setTitleBarItem(title_bar) setTitleBarItem(title_bar)
moveWindowToDesktopCenter() moveWindowToDesktopCenter()