This commit is contained in:
zhuzichu 2023-11-27 16:45:37 +08:00
parent 55a77eba4b
commit 8662eb97aa
6 changed files with 73 additions and 12 deletions

View File

@ -88,6 +88,20 @@ FluScrollablePage{
} }
} }
FluArea{
Layout.fillWidth: true
Layout.topMargin: 20
height: 50
paddings: 10
FluCheckBox{
text:"fitsAppBarWindows"
checked: window.fitsAppBarWindows
anchors.verticalCenter: parent.verticalCenter
onClicked: {
window.fitsAppBarWindows = !window.fitsAppBarWindows
}
}
}
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
@ -215,5 +229,4 @@ FluScrollablePage{
} }
} }
} }
} }

View File

@ -41,8 +41,11 @@ FluWindow {
} }
} }
Component.onCompleted: { onFirstVisible: {
tour.open() tour.open()
}
Component.onCompleted: {
checkUpdate(true) checkUpdate(true)
FluEventBus.registerEvent(event_checkupdate) FluEventBus.registerEvent(event_checkupdate)
} }
@ -239,7 +242,7 @@ FluWindow {
} }
function handleDarkChanged(button){ function handleDarkChanged(button){
if(!FluTheme.enableAnimation){ if(!FluTheme.enableAnimation || window.fitsAppBarWindows === false){
changeDark() changeDark()
}else{ }else{
loader_reveal.sourceComponent = com_reveal loader_reveal.sourceComponent = com_reveal

View File

@ -91,6 +91,21 @@ FluScrollablePage{
} }
} }
FluArea{
Layout.fillWidth: true
Layout.topMargin: 20
height: 50
paddings: 10
FluCheckBox{
text:"fitsAppBarWindows"
checked: window.fitsAppBarWindows
anchors.verticalCenter: parent.verticalCenter
onClicked: {
window.fitsAppBarWindows = !window.fitsAppBarWindows
}
}
}
FluArea{ FluArea{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 20 Layout.topMargin: 20
@ -217,5 +232,4 @@ FluScrollablePage{
} }
} }
} }
} }

View File

@ -44,8 +44,11 @@ FluWindow {
} }
} }
Component.onCompleted: { onFirstVisible: {
tour.open() tour.open()
}
Component.onCompleted: {
checkUpdate(true) checkUpdate(true)
FluEventBus.registerEvent(event_checkupdate) FluEventBus.registerEvent(event_checkupdate)
} }
@ -242,7 +245,7 @@ FluWindow {
} }
function handleDarkChanged(button){ function handleDarkChanged(button){
if(!FluTheme.enableAnimation){ if(!FluTheme.enableAnimation || window.fitsAppBarWindows === false){
changeDark() changeDark()
}else{ }else{
loader_reveal.sourceComponent = com_reveal loader_reveal.sourceComponent = com_reveal

View File

@ -49,6 +49,7 @@ Window {
} }
} }
signal initArgument(var argument) signal initArgument(var argument)
signal firstVisible()
id:window id:window
maximumWidth: useSystemAppBar&&fixSize ? width : 16777215 maximumWidth: useSystemAppBar&&fixSize ? width : 16777215
maximumHeight: useSystemAppBar&&fixSize ? height : 16777215 maximumHeight: useSystemAppBar&&fixSize ? height : 16777215
@ -76,10 +77,15 @@ Window {
lifecycle.onDestruction() lifecycle.onDestruction()
} }
onVisibleChanged: { onVisibleChanged: {
if(visible && d.isFirstVisible){
window.firstVisible()
d.isFirstVisible = false
}
lifecycle.onVisible(visible) lifecycle.onVisible(visible)
} }
QtObject{ QtObject{
id:d id:d
property bool isFirstVisible: true
function changedStayTop(){ function changedStayTop(){
function toggleStayTop(){ function toggleStayTop(){
if(window.stayTop){ if(window.stayTop){
@ -118,13 +124,18 @@ Window {
left: parent.left left: parent.left
right: parent.right right: parent.right
} }
sourceComponent: window.useSystemAppBar ? undefined : com_app_bar sourceComponent: FluApp.useSystemAppBar ? undefined : com_app_bar
} }
Component{ Component{
id:com_app_bar id:com_app_bar
Item{ Item{
data: window.appBar data: window.appBar
height: window.fitsAppBarWindows ? 0 : childrenRect.height height: {
if(FluApp.useSystemAppBar){
return 0
}
return window.fitsAppBarWindows ? 0 : childrenRect.height
}
} }
} }
Item{ Item{
@ -243,7 +254,7 @@ Window {
id:loader_window_border id:loader_window_border
anchors.fill: parent anchors.fill: parent
z:999 z:999
sourceComponent: window.useSystemAppBar ? undefined : com_window_border sourceComponent: FluApp.useSystemAppBar ? undefined : com_window_border
} }
Component{ Component{
id:com_window_border id:com_window_border
@ -301,4 +312,7 @@ Window {
_pageRegister.onResult(data) _pageRegister.onResult(data)
} }
} }
function containerItem(){
return container
}
} }

View File

@ -48,6 +48,7 @@ Window {
} }
} }
signal initArgument(var argument) signal initArgument(var argument)
signal firstVisible()
id:window id:window
maximumWidth: useSystemAppBar&&fixSize ? width : 16777215 maximumWidth: useSystemAppBar&&fixSize ? width : 16777215
maximumHeight: useSystemAppBar&&fixSize ? height : 16777215 maximumHeight: useSystemAppBar&&fixSize ? height : 16777215
@ -75,10 +76,15 @@ Window {
lifecycle.onDestruction() lifecycle.onDestruction()
} }
onVisibleChanged: { onVisibleChanged: {
if(visible && d.isFirstVisible){
window.firstVisible()
d.isFirstVisible = false
}
lifecycle.onVisible(visible) lifecycle.onVisible(visible)
} }
QtObject{ QtObject{
id:d id:d
property bool isFirstVisible: true
function changedStayTop(){ function changedStayTop(){
function toggleStayTop(){ function toggleStayTop(){
if(window.stayTop){ if(window.stayTop){
@ -117,13 +123,18 @@ Window {
left: parent.left left: parent.left
right: parent.right right: parent.right
} }
sourceComponent: window.useSystemAppBar ? undefined : com_app_bar sourceComponent: FluApp.useSystemAppBar ? undefined : com_app_bar
} }
Component{ Component{
id:com_app_bar id:com_app_bar
Item{ Item{
data: window.appBar data: window.appBar
height: window.fitsAppBarWindows ? 0 : childrenRect.height height: {
if(FluApp.useSystemAppBar){
return 0
}
return window.fitsAppBarWindows ? 0 : childrenRect.height
}
} }
} }
Item{ Item{
@ -242,7 +253,7 @@ Window {
id:loader_window_border id:loader_window_border
anchors.fill: parent anchors.fill: parent
z:999 z:999
sourceComponent: window.useSystemAppBar ? undefined : com_window_border sourceComponent: FluApp.useSystemAppBar ? undefined : com_window_border
} }
Component{ Component{
id:com_window_border id:com_window_border
@ -300,4 +311,7 @@ Window {
_pageRegister.onResult(data) _pageRegister.onResult(data)
} }
} }
function containerItem(){
return container
}
} }