This commit is contained in:
朱子楚\zhuzi 2024-06-23 11:59:49 +08:00
parent 649edbea0d
commit fdaaa85541
3 changed files with 9 additions and 4 deletions

View File

@ -234,7 +234,7 @@ FluWindow {
id: com_reveal id: com_reveal
CircularReveal{ CircularReveal{
id: reveal id: reveal
target: window.contentItem target: window.containerItem()
anchors.fill: parent anchors.fill: parent
onAnimationFinished:{ onAnimationFinished:{
// //
@ -263,7 +263,7 @@ FluWindow {
return return
} }
loader_reveal.sourceComponent = com_reveal loader_reveal.sourceComponent = com_reveal
var target = window.contentItem var target = window.containerItem()
var pos = button.mapToItem(target,0,0) var pos = button.mapToItem(target,0,0)
var mouseX = pos.x var mouseX = pos.x
var mouseY = pos.y var mouseY = pos.y

View File

@ -275,7 +275,7 @@ Window {
sourceComponent: window.useSystemAppBar ? undefined : com_app_bar sourceComponent: window.useSystemAppBar ? undefined : com_app_bar
} }
Item{ Item{
id:layout_content id: layout_content
anchors{ anchors{
top: loader_app_bar.bottom top: loader_app_bar.bottom
left: parent.left left: parent.left
@ -294,7 +294,6 @@ Window {
id:info_bar id:info_bar
root: layout_container root: layout_container
} }
FluLoader{ FluLoader{
id:loader_border id:loader_border
anchors.fill: parent anchors.fill: parent
@ -364,4 +363,7 @@ Window {
function deleteLater(){ function deleteLater(){
FluTools.deleteLater(window) FluTools.deleteLater(window)
} }
function containerItem(){
return layout_container
}
} }

View File

@ -363,4 +363,7 @@ Window {
function deleteLater(){ function deleteLater(){
FluTools.deleteLater(window) FluTools.deleteLater(window)
} }
function containerItem(){
return layout_container
}
} }