amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-11-26 21:37:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2023-10-20 21:28:51 +08:00
parent 5f6d66b6ce
commit c6a43c41db
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/qml-Qt6/window/MainWindow.qml
View File

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

2
example/qml/window/MainWindow.qml
View File

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

2
framelesshelper

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

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

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

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

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