From 93832fb325f5d576a230435ddb10f4a853620a28 Mon Sep 17 00:00:00 2001
From: zhuzichu <zhuzichu520@gmail.com>
Date: Mon, 22 Jan 2024 15:41:43 +0800
Subject: [PATCH] fix bug #408

---
 src/Qt5/imports/FluentUI/Controls/FluExpander.qml | 7 +++----
 src/Qt6/imports/FluentUI/Controls/FluExpander.qml | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Qt5/imports/FluentUI/Controls/FluExpander.qml b/src/Qt5/imports/FluentUI/Controls/FluExpander.qml
index b4a4d568..7e50531e 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluExpander.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluExpander.qml
@@ -70,10 +70,10 @@ Item {
             topMargin: -1
             left: layout_header.left
         }
-        width: parent.width
         clip: true
-        visible: contentHeight+container.y !== 0
-        height: contentHeight+container.y
+        visible: contentHeight+container.anchors.topMargin !== 0
+        height: contentHeight+container.anchors.topMargin
+        width: parent.width
         Rectangle{
             id:container
             anchors.fill: parent
@@ -82,7 +82,6 @@ Item {
             color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
             border.color: FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
             anchors.topMargin: -contentHeight
-            //            y: -contentHeight
             states: [
                 State{
                     name:"expand"
diff --git a/src/Qt6/imports/FluentUI/Controls/FluExpander.qml b/src/Qt6/imports/FluentUI/Controls/FluExpander.qml
index 8b4fb16f..6c1bd3d8 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluExpander.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluExpander.qml
@@ -70,10 +70,10 @@ Item {
             topMargin: -1
             left: layout_header.left
         }
-        width: parent.width
         clip: true
-        visible: contentHeight+container.y !== 0
-        height: contentHeight+container.y
+        visible: contentHeight+container.anchors.topMargin !== 0
+        height: contentHeight+container.anchors.topMargin
+        width: parent.width
         Rectangle{
             id:container
             anchors.fill: parent
@@ -82,7 +82,6 @@ Item {
             color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
             border.color: FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
             anchors.topMargin: -contentHeight
-            //            y: -contentHeight
             states: [
                 State{
                     name:"expand"