Skip to content

Commit

Permalink
fix bug
Browse files Browse the repository at this point in the history
  • Loading branch information
朱子楚\zhuzi committed Jun 23, 2024
1 parent 649edbe commit fdaaa85
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
4 changes: 2 additions & 2 deletions example/qml/window/MainWindow.qml
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ FluWindow {
id: com_reveal
CircularReveal{
id: reveal
target: window.contentItem
target: window.containerItem()
anchors.fill: parent
onAnimationFinished:{
//动画结束后释放资源
Expand Down Expand Up @@ -263,7 +263,7 @@ FluWindow {
return
}
loader_reveal.sourceComponent = com_reveal
var target = window.contentItem
var target = window.containerItem()
var pos = button.mapToItem(target,0,0)
var mouseX = pos.x
var mouseY = pos.y
Expand Down
6 changes: 4 additions & 2 deletions src/Qt5/imports/FluentUI/Controls/FluWindow.qml
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ Window {
sourceComponent: window.useSystemAppBar ? undefined : com_app_bar
}
Item{
id:layout_content
id: layout_content
anchors{
top: loader_app_bar.bottom
left: parent.left
Expand All @@ -294,7 +294,6 @@ Window {
id:info_bar
root: layout_container
}

FluLoader{
id:loader_border
anchors.fill: parent
Expand Down Expand Up @@ -364,4 +363,7 @@ Window {
function deleteLater(){
FluTools.deleteLater(window)
}
function containerItem(){
return layout_container
}
}
3 changes: 3 additions & 0 deletions src/Qt6/imports/FluentUI/Controls/FluWindow.qml
Original file line number Diff line number Diff line change
Expand Up @@ -363,4 +363,7 @@ Window {
function deleteLater(){
FluTools.deleteLater(window)
}
function containerItem(){
return layout_container
}
}

0 comments on commit fdaaa85

Please sign in to comment.