From 7d1666597f5330f1d253acc6a654d6a8939b96ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?=
 <zhuzichu520@outlook.com>
Date: Tue, 2 Apr 2024 00:32:06 +0800
Subject: [PATCH] update

---
 example/example_en_US.ts                        | 9 +++++++++
 example/example_zh_CN.ts                        | 9 +++++++++
 src/Qt5/imports/FluentUI/Controls/FluPopup.qml  | 2 +-
 src/Qt5/imports/FluentUI/Controls/FluWindow.qml | 2 +-
 src/Qt6/imports/FluentUI/Controls/FluPopup.qml  | 2 +-
 src/Qt6/imports/FluentUI/Controls/FluWindow.qml | 2 +-
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/example/example_en_US.ts b/example/example_en_US.ts
index 6c797b1b..dfdff1bc 100644
--- a/example/example_en_US.ts
+++ b/example/example_en_US.ts
@@ -375,6 +375,7 @@
     <message>
         <location filename="qml/global/ItemsOriginal.qml" line="318"/>
         <source>TableView</source>
+        <oldsource>TreeView2</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2385,6 +2386,14 @@ Some contents...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>T_TreeView2</name>
+    <message>
+        <location filename="qml/page/T_TreeView2.qml" line="10"/>
+        <source>TreeView2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>T_Typography</name>
     <message>
diff --git a/example/example_zh_CN.ts b/example/example_zh_CN.ts
index 7af389cd..91add544 100644
--- a/example/example_zh_CN.ts
+++ b/example/example_zh_CN.ts
@@ -375,6 +375,7 @@
     <message>
         <location filename="qml/global/ItemsOriginal.qml" line="318"/>
         <source>TableView</source>
+        <oldsource>TreeView2</oldsource>
         <translation type="unfinished">表格</translation>
     </message>
     <message>
@@ -2468,6 +2469,14 @@ Some contents...</source>
         <translation type="unfinished">共计选中%1条数据</translation>
     </message>
 </context>
+<context>
+    <name>T_TreeView2</name>
+    <message>
+        <location filename="qml/page/T_TreeView2.qml" line="10"/>
+        <source>TreeView2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>T_Typography</name>
     <message>
diff --git a/src/Qt5/imports/FluentUI/Controls/FluPopup.qml b/src/Qt5/imports/FluentUI/Controls/FluPopup.qml
index 1f777f0e..24f69723 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluPopup.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluPopup.qml
@@ -11,7 +11,7 @@ Popup {
     parent: Overlay.overlay
     x: Math.round((d.parentWidth - width) / 2)
     y: Math.round((d.parentHeight - height) / 2)
-    closePolicy: Popup.CloseOnEscape
+    closePolicy: Popup.NoAutoClose
     enter: Transition {
         NumberAnimation {
             property: "opacity"
diff --git a/src/Qt5/imports/FluentUI/Controls/FluWindow.qml b/src/Qt5/imports/FluentUI/Controls/FluWindow.qml
index fbdf62ee..6c959f43 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluWindow.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluWindow.qml
@@ -65,7 +65,7 @@ Window {
     Component.onCompleted: {
         FluRouter.addWindow(window)
         useSystemAppBar = FluApp.useSystemAppBar
-        if(useSystemAppBar && autoCenter){
+        if(!useSystemAppBar && autoCenter){
             moveWindowToDesktopCenter()
         }
         fixWindowSize()
diff --git a/src/Qt6/imports/FluentUI/Controls/FluPopup.qml b/src/Qt6/imports/FluentUI/Controls/FluPopup.qml
index c933bea3..785ce5f2 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluPopup.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluPopup.qml
@@ -11,7 +11,7 @@ Popup {
     parent: Overlay.overlay
     x: Math.round((d.parentWidth - width) / 2)
     y: Math.round((d.parentHeight - height) / 2)
-    closePolicy: Popup.CloseOnEscape
+    closePolicy: Popup.NoAutoClose
     enter: Transition {
         NumberAnimation {
             property: "opacity"
diff --git a/src/Qt6/imports/FluentUI/Controls/FluWindow.qml b/src/Qt6/imports/FluentUI/Controls/FluWindow.qml
index 4b88b1e3..43438fe4 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluWindow.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluWindow.qml
@@ -64,7 +64,7 @@ Window {
     Component.onCompleted: {
         FluRouter.addWindow(window)
         useSystemAppBar = FluApp.useSystemAppBar
-        if(useSystemAppBar && autoCenter){
+        if(!useSystemAppBar && autoCenter){
             moveWindowToDesktopCenter()
         }
         fixWindowSize()