Compare commits

..

2 Commits

Author SHA1 Message Date
朱子楚\zhuzi 1e5c70c7b4 update 2023-10-20 21:32:11 +08:00
朱子楚\zhuzi c6a43c41db update 2023-10-20 21:28:51 +08:00
9 changed files with 23 additions and 11 deletions

View File

@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
os: [macos-latest]
qt_ver: [6.5.0]
qt_ver: [6.6.0]
qt_arch: [clang_64]
env:
targetName: example
@ -50,7 +50,7 @@ jobs:
cmake --version
mkdir build
cd build
cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/FluentUI/Qt/6.5.0/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/FluentUI/Qt/6.6.0/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
cmake --build . --target all --config Release --parallel
- name: package

View File

@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04]
qt_ver: [6.5.0]
qt_ver: [6.6.0]
qt_arch: [gcc_64]
env:
targetName: example
@ -55,7 +55,7 @@ jobs:
cmake --version
mkdir build
cd build
cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/home/runner/work/FluentUI/Qt/6.5.0/gcc_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/home/runner/work/FluentUI/Qt/6.6.0/gcc_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
cmake --build . --target all --config Release --parallel
- name: install QT linux deploy

View File

@ -24,7 +24,7 @@ jobs:
os: [windows-2022]
include:
- qt_arch: win64_mingw
qt_ver: 6.5.0
qt_ver: 6.6.0
qt_tools: "tools_mingw,9.0.0-1-202203221220,qt.tools.win64_mingw900"
qt_tools_mingw_install: mingw900_64
env:
@ -69,7 +69,7 @@ jobs:
mkdir build
cd build
ninja --version
cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\6.5.0\mingw_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\6.6.0\mingw_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
cmake --build . --target all --config Release --parallel
- name: package

View File

@ -23,7 +23,7 @@ jobs:
matrix:
os: [windows-2019]
include:
- qt_ver: 6.5.0
- qt_ver: 6.6.0
qt_arch: win64_msvc2019_64
msvc_arch: x64
qt_arch_install: msvc2019_64
@ -52,7 +52,7 @@ jobs:
ninja --version
mkdir build
cd build
cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\6.5.0\msvc2019_64 -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -GNinja ..
cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\6.6.0\msvc2019_64 -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -GNinja ..
cmake --build . --target all --config Release --parallel
echo winSdkDir=%WindowsSdkDir% >> %GITHUB_ENV%
echo winSdkVer=%WindowsSdkVersion% >> %GITHUB_ENV%

View File

@ -254,7 +254,7 @@ FluWindow {
}
function handleDarkChanged(button){
if(FluTools.isMacos() || !FluTheme.enableAnimation){
if(!FluTheme.enableAnimation){
changeDark()
}else{
loader_reveal.sourceComponent = com_reveal

View File

@ -257,7 +257,7 @@ FluWindow {
}
function handleDarkChanged(button){
if(FluTools.isMacos() || !FluTheme.enableAnimation){
if(!FluTheme.enableAnimation){
changeDark()
}else{
loader_reveal.sourceComponent = com_reveal

@ -1 +1 @@
Subproject commit 125da5c8e1ab37ce87c863c7c336a27bf64cec54
Subproject commit 80f869adcaf7db76ba8088f2c16382dcd5feaafb

View File

@ -14,6 +14,7 @@ Window {
property bool fixSize: false
property Component loadingItem: com_loading
property var appBar: com_app_bar
flags: Qt.Window | Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowSystemMenuHint | Qt.WindowMinMaxButtonsHint | Qt.WindowCloseButtonHint
property color backgroundColor: {
if(active){
return FluTheme.dark ? Qt.rgba(26/255,34/255,40/255,1) : Qt.rgba(243/255,243/255,243/255,1)
@ -48,14 +49,19 @@ Window {
onVisibleChanged: {
lifecycle.onVisible(visible)
}
onVisibilityChanged: {
console.debug(visibility)
}
QtObject{
id:d
function changedStayTop(){
var visibility = window.visibility
if(window.stayTop){
window.flags = window.flags | Qt.WindowStaysOnTopHint
}else{
window.flags = window.flags &~ Qt.WindowStaysOnTopHint
}
window.visibility = visibility
}
}
Connections{

View File

@ -13,6 +13,7 @@ Window {
property bool fixSize: false
property Component loadingItem: com_loading
property var appBar: com_app_bar
flags: Qt.Window | Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowSystemMenuHint | Qt.WindowMinMaxButtonsHint | Qt.WindowCloseButtonHint
property color backgroundColor: {
if(active){
return FluTheme.dark ? Qt.rgba(26/255,34/255,40/255,1) : Qt.rgba(243/255,243/255,243/255,1)
@ -47,14 +48,19 @@ Window {
onVisibleChanged: {
lifecycle.onVisible(visible)
}
onVisibilityChanged: {
console.debug(visibility)
}
QtObject{
id:d
function changedStayTop(){
var visibility = window.visibility
if(window.stayTop){
window.flags = window.flags | Qt.WindowStaysOnTopHint
}else{
window.flags = window.flags &~ Qt.WindowStaysOnTopHint
}
window.visibility = visibility
}
}
Connections{