From 8fdd4f7e20d94b1aa318a09b0ef6a22075dfcbfe Mon Sep 17 00:00:00 2001
From: "B.Melnik" <b.melnik@restream.rt.ru>
Date: Thu, 20 May 2021 09:25:52 +0300
Subject: [PATCH] fix: fix crash on removing title bar

---
 ui/StatusQ/sandbox/main.qml                   |  4 +++-
 ui/StatusQ/sandbox/sandbox.pro                |  5 +++--
 ui/StatusQ/sandbox/sandboxapp.cpp             | 11 ++++------
 ui/StatusQ/sandbox/sandboxapp.h               |  2 --
 ui/StatusQ/sandbox/statuswindow.h             | 21 +++++++++++++++++++
 ...{sandboxapp_mac.mm => statuswindow_mac.mm} |  4 ++--
 6 files changed, 33 insertions(+), 14 deletions(-)
 create mode 100644 ui/StatusQ/sandbox/statuswindow.h
 rename ui/StatusQ/sandbox/{sandboxapp_mac.mm => statuswindow_mac.mm} (85%)

diff --git a/ui/StatusQ/sandbox/main.qml b/ui/StatusQ/sandbox/main.qml
index c1f8dbb070..6ba995db81 100644
--- a/ui/StatusQ/sandbox/main.qml
+++ b/ui/StatusQ/sandbox/main.qml
@@ -2,10 +2,12 @@ import QtQuick 2.14
 import QtQuick.Window 2.14
 import QtQuick.Controls 2.14
 
+import Sandbox 0.1
+
 import StatusQ.Core 0.1
 import StatusQ.Core.Theme 0.1
 
-Window {
+StatusWindow {
     id: rootWindow
     width: 1024
     height: 840
diff --git a/ui/StatusQ/sandbox/sandbox.pro b/ui/StatusQ/sandbox/sandbox.pro
index e3fe24c53e..039aa49f47 100644
--- a/ui/StatusQ/sandbox/sandbox.pro
+++ b/ui/StatusQ/sandbox/sandbox.pro
@@ -12,7 +12,7 @@ SOURCES += \
         sandboxapp.cpp
 
 OBJECTIVE_SOURCES += \
-        sandboxapp_mac.mm
+    statuswindow_mac.mm
 
 RESOURCES += qml.qrc
 
@@ -28,7 +28,8 @@ OTHER_FILES += $$files($$PWD/../src/*, true)
 
 HEADERS += \
     handler.h \
-    sandboxapp.h
+    sandboxapp.h \
+    statuswindow.h
 
 DISTFILES += \
     ../src/StatusQ/Controls/StatusBaseButton.qml \
diff --git a/ui/StatusQ/sandbox/sandboxapp.cpp b/ui/StatusQ/sandbox/sandboxapp.cpp
index cc4eeeedc1..2c7d2834d7 100644
--- a/ui/StatusQ/sandbox/sandboxapp.cpp
+++ b/ui/StatusQ/sandbox/sandboxapp.cpp
@@ -4,6 +4,8 @@
 #include <QWindow>
 #include <QDebug>
 
+#include "statuswindow.h"
+
 SandboxApp::SandboxApp(int &argc, char **argv)
     : QGuiApplication(argc, argv),
       m_handler(new Handler(this))
@@ -13,6 +15,8 @@ SandboxApp::SandboxApp(int &argc, char **argv)
 
 void SandboxApp::startEngine()
 {
+    qmlRegisterType<StatusWindow>("Sandbox", 0, 1, "StatusWindow");
+
     const QUrl url(applicationDirPath() + "/../main.qml");
 
     m_engine.rootContext()->setContextProperty("app", m_handler);
@@ -25,13 +29,6 @@ void SandboxApp::startEngine()
                 QCoreApplication::exit(-1);
         }, Qt::QueuedConnection);
     m_engine.load(url);
-
-    QWindow *rootWindow = qobject_cast<QWindow*>(m_engine.rootObjects().at(0));
-    if (rootWindow) {
-        removeTitleBar(rootWindow->winId());
-    } else {
-        qDebug() << "Window doesn't exist";
-    }
 }
 
 void SandboxApp::restartEngine()
diff --git a/ui/StatusQ/sandbox/sandboxapp.h b/ui/StatusQ/sandbox/sandboxapp.h
index 834d7045a3..8589baab72 100644
--- a/ui/StatusQ/sandbox/sandboxapp.h
+++ b/ui/StatusQ/sandbox/sandboxapp.h
@@ -13,8 +13,6 @@ public:
 
     void startEngine();
 
-    void removeTitleBar(WId wid);
-
 public slots:
     void restartEngine();
 
diff --git a/ui/StatusQ/sandbox/statuswindow.h b/ui/StatusQ/sandbox/statuswindow.h
new file mode 100644
index 0000000000..4bbcf9c699
--- /dev/null
+++ b/ui/StatusQ/sandbox/statuswindow.h
@@ -0,0 +1,21 @@
+#ifndef STATUSWINDOW_H
+#define STATUSWINDOW_H
+
+#include <QQuickWindow>
+
+class StatusWindow: public QQuickWindow
+{
+    Q_OBJECT
+
+public:
+    explicit StatusWindow(QWindow *parent = nullptr)
+        : QQuickWindow(parent)
+    {
+        removeTitleBar(winId());
+    }
+
+private:
+    void removeTitleBar(WId wid);
+};
+
+#endif // STATUSWINDOW_H
diff --git a/ui/StatusQ/sandbox/sandboxapp_mac.mm b/ui/StatusQ/sandbox/statuswindow_mac.mm
similarity index 85%
rename from ui/StatusQ/sandbox/sandboxapp_mac.mm
rename to ui/StatusQ/sandbox/statuswindow_mac.mm
index f4b5c60889..25c6a665bf 100644
--- a/ui/StatusQ/sandbox/sandboxapp_mac.mm
+++ b/ui/StatusQ/sandbox/statuswindow_mac.mm
@@ -1,4 +1,4 @@
-#include "sandboxapp.h"
+#include "statuswindow.h"
 
 #include <QColor>
 
@@ -7,7 +7,7 @@
 #include <AppKit/NSWindow.h>
 #include <AppKit/NSColor.h>
 
-void SandboxApp::removeTitleBar(WId wid)
+void StatusWindow::removeTitleBar(WId wid)
 {
     NSView *nsView = reinterpret_cast<NSView*>(wid);
     NSWindow *window = [nsView window];