wuyize
/
FluentUI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: wuyize:main
Branches Tags
wuyize:main
..
compare: wuyize:3973b5c923d3719ae20fea5a75a2146833ff2960
Branches Tags
wuyize:main

No commits in common. "main" and "3973b5c923d3719ae20fea5a75a2146833ff2960" have entirely different histories.
main ... 3973b5c923

3 changed files with 6 additions and 7 deletions
Show Stats Expand all files Collapse all files

8
example/CMakeLists.txt
View File

@ -11,9 +11,9 @@ endif()
#设置可执行文件输出目录 #设置可执行文件输出目录
if(CMAKE_BUILD_TYPE STREQUAL "Debug") if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin/debug) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/debug)
else() else()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin/release) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/release)
endif() endif()
#获取文件路径分隔符（解决执行命令的时候有些平台会报错） #获取文件路径分隔符（解决执行命令的时候有些平台会报错）
@ -60,9 +60,9 @@ endif ()
#复制动态库到可执行文件同级目录下 #复制动态库到可执行文件同级目录下
if(WIN32) if(WIN32)
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(DLLPATH ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/msvc/*.dll) set(DLLPATH ${CMAKE_SOURCE_DIR}/3rdparty/msvc/*.dll)
else() else()
set(DLLPATH ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/mingw/*.dll) set(DLLPATH ${CMAKE_SOURCE_DIR}/3rdparty/mingw/*.dll)
endif() endif()
string(REPLACE "/" ${PATH_SEPARATOR} DLLPATH "${DLLPATH}") string(REPLACE "/" ${PATH_SEPARATOR} DLLPATH "${DLLPATH}")
file(GLOB DLL_FILES ${DLLPATH}) file(GLOB DLL_FILES ${DLLPATH})

2
src/CMakeLists.txt
View File

@ -10,7 +10,7 @@ if(APPLE)
endif() endif()
#设置QML插件输出目录->D:\Qt\6.4.3\msvc2019_64\qml\FluentUI #设置QML插件输出目录->D:\Qt\6.4.3\msvc2019_64\qml\FluentUI
set(QML_PLUGIN_DIRECTORY ${Qt6_DIR}/../../../qml/FluentUI) set(QML_PLUGIN_DIRECTORY ${Qt6_DIR}/qml/FluentUI)
#设置版本号 #设置版本号
add_definitions(-DVERSION=1,3,3,0) add_definitions(-DVERSION=1,3,3,0)

3
src/imports/FluentUI/Controls/FluArea.qml
View File

@ -10,9 +10,8 @@ Rectangle {
property int rightPadding : 0 property int rightPadding : 0
property int topPadding : 0 property int topPadding : 0
property int bottomPadding : 0 property int bottomPadding : 0
property var backgroundColor: FluTheme.dark ? Window.active ? Qt.rgba(38/255,44/255,54/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
color: backgroundColor
radius: 4 radius: 4
color: FluTheme.dark ? Window.active ? Qt.rgba(38/255,44/255,54/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
border.color: FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1) border.color: FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
border.width: 1 border.width: 1
implicitHeight: height implicitHeight: height