From 6d24cbf37ca8c47454c0cea2713d16b016cced6b Mon Sep 17 00:00:00 2001
From: zhuzichu <zhuzichu520@outlook.com>
Date: Thu, 20 Apr 2023 20:13:31 +0800
Subject: [PATCH] update

---
 example/page/MainPage.qml  | 13 +++++--------
 src/controls/FluWindow.qml | 18 +++++++++---------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/example/page/MainPage.qml b/example/page/MainPage.qml
index c0c4f42..08b17cd 100644
--- a/example/page/MainPage.qml
+++ b/example/page/MainPage.qml
@@ -15,6 +15,11 @@ FluWindow {
     minimumWidth: 520
     minimumHeight: 460
 
+    closeFunc:function(event){
+        close_app.open()
+        event.accepted = false
+    }
+
     FluAppBar{
         id:appbar
         z:9
@@ -66,14 +71,6 @@ FluWindow {
 
     }
 
-    onClosing:
-    {
-        window.show()
-        window.raise()
-        window.requestActivate()
-        close_app.open()
-    }
-
     FluNavigationView{
         id:nav_view
         anchors.fill: parent
diff --git a/src/controls/FluWindow.qml b/src/controls/FluWindow.qml
index 5c403ef..e35e659 100644
--- a/src/controls/FluWindow.qml
+++ b/src/controls/FluWindow.qml
@@ -18,6 +18,14 @@ ApplicationWindow {
     property string route
     property var argument:({})
     property var pageRegister
+    property var closeFunc: function(event){
+        if(closeDestory){
+            destoryWindow()
+        }else{
+            visible = false
+            event.accepted = false
+        }
+    }
     signal initArgument(var argument)
 
     id:window
@@ -48,15 +56,7 @@ ApplicationWindow {
         }
     }
 
-    onClosing:
-        (event)=>{
-            if(closeDestory){
-                destoryWindow()
-            }else{
-                visible = false
-                event.accepted = false
-            }
-        }
+    onClosing:(event)=>closeFunc(event)
 
     FluInfoBar{
         id:infoBar