change toast to window

doric-Qt/doric/plugin/DoricModalPlugin.cpp

@@ -5,7 +5,7 @@
 #include <QJsonDocument>
 #include <QObject>
 #include <QQmlComponent>
-#include <QQuickItem>
+#include <QQuickWindow>
 #include <QTimer>
 
 void DoricModalPlugin::toast(QString jsValueString, QString callbackId) {
@@ -18,56 +18,55 @@ void DoricModalPlugin::toast(QString jsValueString, QString callbackId) {
         QString msg = jsValue["msg"].toString();
         int gravity = jsValue["gravity"].toInt();
 
-        QQuickItem *rootObject =
-            getContext()->getRootNode()->getRootView()->parentItem();
         QQmlComponent component(getContext()->getQmlEngine());
         const QUrl url(QStringLiteral("qrc:/doric/qml/toast.qml"));
         component.loadUrl(url);
         if (component.isError()) {
           qCritical() << component.errorString();
         }
-        QQuickItem *item = qobject_cast<QQuickItem *>(component.create());
+        QQuickWindow *window = qobject_cast<QQuickWindow *>(component.create());
-        item->setParentItem(rootObject);
 
+        QQuickWindow *parentWindow =
+            getContext()->getRootNode()->getRootView()->window();
+
+        window->contentItem()
+            ->childItems()
+            .at(0)
+            ->childItems()
+            .at(0)
+            ->setProperty("text", msg);
+
+        std::function setX = [window, parentWindow]() {
+          window->setProperty("x",
+                              (parentWindow->width() - window->width()) / 2.f +
+                                  parentWindow->x());
+        };
+        std::function setY = [window, parentWindow, gravity]() {
+          if ((gravity & DoricGravity::DoricGravityBottom) ==
+              DoricGravity::DoricGravityBottom) {
+            window->setProperty("y", parentWindow->height() - window->height() -
+                                         20 + parentWindow->y());
+          } else if ((gravity & DoricGravity::DoricGravityTop) ==
+                     DoricGravity::DoricGravityTop) {
+            window->setProperty("y", 20 + parentWindow->y());
+          } else {
+            window->setProperty(
+                "y", (parentWindow->height() - window->height()) / 2 +
+                         parentWindow->y());
+          }
+        };
+        // init set x
+        setX();
         // init set y
-        if ((gravity & DoricGravity::DoricGravityBottom) ==
+        setY();
-            DoricGravity::DoricGravityBottom) {
-          item->setProperty("y", rootObject->height() - item->height() - 20);
-        } else if ((gravity & DoricGravity::DoricGravityTop) ==
-                   DoricGravity::DoricGravityTop) {
-          item->setProperty("y", 20);
-        } else {
-          item->setProperty("y", (rootObject->height() - item->height()) / 2);
-        }
 
         // update x
-        connect(item, &QQuickItem::widthChanged, [rootObject, item]() {
+        connect(window, &QQuickWindow::widthChanged, setX);
-          item->setProperty("x", (rootObject->width() - item->width()) / 2.f);
-        });
 
         // update y
-        connect(
+        connect(window, &QQuickWindow::heightChanged, setY);
-            item, &QQuickItem::heightChanged, [rootObject, item, gravity]() {
-              if ((gravity & DoricGravity::DoricGravityBottom) ==
-                  DoricGravity::DoricGravityBottom) {
-                item->setProperty("y",
-                                  rootObject->height() - item->height() - 20);
-              } else if ((gravity & DoricGravity::DoricGravityTop) ==
-                         DoricGravity::DoricGravityTop) {
-                item->setProperty("y", 20);
-              } else {
-                item->setProperty("y",
-                                  (rootObject->height() - item->height()) / 2);
-              }
-            });
 
-        item->childItems().at(0)->childItems().at(0)->setProperty("text", msg);
+        QTimer::singleShot(2000, qApp, [window]() { window->deleteLater(); });
-
-        QTimer::singleShot(2000, qApp, [item]() {
-          item->setParent(nullptr);
-          item->setParentItem(nullptr);
-          item->deleteLater();
-        });
       },
       DoricThreadMode::UI);
 }

doric-Qt/doric/resources/toast.qml

@@ -2,10 +2,13 @@ import QtQuick 2.12
 import QtQuick.Controls 2.5
 import QtQuick.Layouts 1.15
 
-Rectangle {
+Window {
-    width: childrenRect.width
+    id: window
-    height: childrenRect.height
+
+    flags: flags | Qt.WindowStaysOnTopHint  | Qt.Tool | Qt.FramelessWindowHint | Qt.WindowTransparentForInput
+
     color: "#bb000000"
+    visible: true
 
     ColumnLayout {
         Text {
@@ -17,6 +20,14 @@ Rectangle {
             Layout.topMargin: 15
             Layout.bottomMargin: 15
         }
+
+        onWidthChanged: {
+            window.width = implicitWidth
+        }
+
+        onHeightChanged: {
+            window.height = implicitHeight
+        }
     }
 }