From 3a775a8bb2be81150d2fc1a8fb89e12b3109aab7 Mon Sep 17 00:00:00 2001
From: zhuzichu <zhuzichu520@gmail.com>
Date: Tue, 17 Oct 2023 10:34:37 +0800
Subject: [PATCH] update

---
 example/qml-Qt6/window/MainWindow.qml                 | 9 ++-------
 example/qml/window/MainWindow.qml                     | 9 ++-------
 src/Qt6/imports/FluentUI/Controls/FluProgressBar.qml  | 1 +
 src/Qt6/imports/FluentUI/Controls/FluProgressRing.qml | 2 +-
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/example/qml-Qt6/window/MainWindow.qml b/example/qml-Qt6/window/MainWindow.qml
index ec575ddc..8adb398b 100644
--- a/example/qml-Qt6/window/MainWindow.qml
+++ b/example/qml-Qt6/window/MainWindow.qml
@@ -15,7 +15,6 @@ FluWindow {
     title: "FluentUI"
     width: 1000
     height: 640
-    closeDestory:false
     minimumWidth: 520
     minimumHeight: 200
     launchMode: FluWindowType.SingleTask
@@ -26,11 +25,6 @@ FluWindow {
         id:viewmodel_settings
     }
 
-    closeListener:function(event){
-        dialog_close.open()
-        event.accepted = false
-    }
-
     FluEvent{
         id:event_checkupdate
         name: "checkUpdate"
@@ -39,7 +33,6 @@ FluWindow {
         }
     }
     Component.onCompleted: {
-        FluTools.setQuitOnLastWindowClosed(false)
         tour.open()
         checkUpdate(true)
         FluEventBus.registerEvent(event_checkupdate)
@@ -122,6 +115,7 @@ FluWindow {
                 showDark: true
                 z:7
                 darkClickListener:(button)=>handleDarkChanged(button)
+                closeClickListener: ()=>{dialog_close.open()}
             }
             Row{
                 z:8
@@ -170,6 +164,7 @@ FluWindow {
                 }
                 darkText: Lang.dark_mode
                 showDark: true
+                closeClickListener: ()=>{dialog_close.open()}
                 darkClickListener:(button)=>handleDarkChanged(button)
                 z:7
             }
diff --git a/example/qml/window/MainWindow.qml b/example/qml/window/MainWindow.qml
index 46685b7d..11bd55fc 100644
--- a/example/qml/window/MainWindow.qml
+++ b/example/qml/window/MainWindow.qml
@@ -18,7 +18,6 @@ FluWindow {
     title: "FluentUI"
     width: 1000
     height: 640
-    closeDestory:false
     minimumWidth: 520
     minimumHeight: 200
     launchMode: FluWindowType.SingleTask
@@ -28,11 +27,6 @@ FluWindow {
         id:viewmodel_settings
     }
 
-    closeListener:function(event){
-        dialog_close.open()
-        event.accepted = false
-    }
-
     FluEvent{
         id:event_checkupdate
         name: "checkUpdate"
@@ -42,7 +36,6 @@ FluWindow {
     }
 
     Component.onCompleted: {
-        FluTools.setQuitOnLastWindowClosed(false)
         tour.open()
         checkUpdate(true)
         FluEventBus.registerEvent(event_checkupdate)
@@ -125,6 +118,7 @@ FluWindow {
                 showDark: true
                 z:7
                 darkClickListener:(button)=>handleDarkChanged(button)
+                closeClickListener: ()=>{dialog_close.open()}
             }
             Row{
                 z:8
@@ -174,6 +168,7 @@ FluWindow {
                 darkText: Lang.dark_mode
                 showDark: true
                 darkClickListener:(button)=>handleDarkChanged(button)
+                closeClickListener: ()=>{dialog_close.open()}
                 z:7
             }
             FluNavigationView{
diff --git a/src/Qt6/imports/FluentUI/Controls/FluProgressBar.qml b/src/Qt6/imports/FluentUI/Controls/FluProgressBar.qml
index 5bdc80db..b80a8cf1 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluProgressBar.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluProgressBar.qml
@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Controls
+import QtQuick.Controls.Basic
 import FluentUI
 
 ProgressBar{
diff --git a/src/Qt6/imports/FluentUI/Controls/FluProgressRing.qml b/src/Qt6/imports/FluentUI/Controls/FluProgressRing.qml
index 2e50c85a..a956d359 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluProgressRing.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluProgressRing.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Controls
-import QtQuick.Shapes
+import QtQuick.Controls.Basic
 import FluentUI
 
 ProgressBar{