From 840e697eb525881621e2cc6c898c86a37ae7ec9d Mon Sep 17 00:00:00 2001
From: Mentalflow <312902918@qq.com>
Date: Tue, 4 Jun 2024 21:21:16 +0800
Subject: [PATCH] RibbonWindow: Fix showWindow() in Qt5.

---
 lib_source/qml/Qt5/RibbonWindow.qml | 6 ++++--
 lib_source/qml/Qt6/RibbonWindow.qml | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib_source/qml/Qt5/RibbonWindow.qml b/lib_source/qml/Qt5/RibbonWindow.qml
index 9404582..d9efebb 100644
--- a/lib_source/qml/Qt5/RibbonWindow.qml
+++ b/lib_source/qml/Qt5/RibbonWindow.qml
@@ -156,6 +156,8 @@ Window {
     }
 
     function showWindow(window_url, args){
+        if(typeof args === "undefined")
+            args = {}
         let sub_windows = RibbonUI.windowsSet
         if (sub_windows.hasOwnProperty(window_url)&&sub_windows[window_url]['windowStatus'] !== RibbonWindow.Status.Stardard)
         {
@@ -181,9 +183,9 @@ Window {
                 sub_windows[window_url].close()
             }
         }
-        var component = Qt.createComponent(window_url, Component.PreferSynchronous, undefined);
+        var component = Qt.createComponent(window_url, Component.PreferSynchronous, null);
         if (component.status === Component.Ready) {
-            var window = component.createObject(undefined, args)
+            var window = component.createObject(null, args)
             if (!(window instanceof Window))
             {
                 console.error("RibbonWindow: Error loading Window: Instance is not Window.")
diff --git a/lib_source/qml/Qt6/RibbonWindow.qml b/lib_source/qml/Qt6/RibbonWindow.qml
index 7840715..1c34064 100644
--- a/lib_source/qml/Qt6/RibbonWindow.qml
+++ b/lib_source/qml/Qt6/RibbonWindow.qml
@@ -155,6 +155,8 @@ Window {
     }
 
     function showWindow(window_url, args){
+        if(typeof args === "undefined")
+            args = {}
         let sub_windows = RibbonUI.windowsSet
         if (sub_windows.hasOwnProperty(window_url)&&sub_windows[window_url]['windowStatus'] !== RibbonWindow.Status.Stardard)
         {
@@ -180,9 +182,9 @@ Window {
                 sub_windows[window_url].close()
             }
         }
-        var component = Qt.createComponent(window_url, Component.PreferSynchronous, undefined);
+        var component = Qt.createComponent(window_url, Component.PreferSynchronous, null);
         if (component.status === Component.Ready) {
-            var window = component.createObject(undefined, args)
+            var window = component.createObject(null, args)
             if (!(window instanceof Window))
             {
                 console.error("RibbonWindow: Error loading Window: Instance is not Window.")