3 files changed, 8 insertions, 38 deletions

diff --git a/app/Messaging.qml b/app/Messaging.qml
index 8494145..f59850a 100644
--- a/app/Messaging.qml
+++ b/app/Messaging.qml
@@ -19,6 +19,7 @@ import QtQuick 2.11
 import QtQuick.Layouts 1.11
 import QtQuick.Controls 2.4
 import AGL.Demo.Controls 1.0
+import QtQuick.Window 2.13
 
 ApplicationWindow {
     id: root
@@ -29,9 +30,10 @@ ApplicationWindow {
     Item {
         id: container
         anchors.centerIn: parent
-        width: 1080
-        height: 1487
-        scale: screenInfo.scale_factor()
+        width: Screen.width
+        height: Screen.height
+        //scale: screenInfo.scale_factor()
+        scale: 1
 
         TabBar {
             id: bar
diff --git a/app/app.pro b/app/app.pro
index 500ccda..d14d2cf 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -4,7 +4,7 @@ QT = quickcontrols2 websockets
 SOURCES = main.cpp
 
 CONFIG += link_pkgconfig
-PKGCONFIG += libhomescreen qlibwindowmanager qtappfw-bt-map libafbwsc
+PKGCONFIG += libhomescreen qtappfw-bt-map libafbwsc
 
 CONFIG(release, debug|release) {
     QMAKE_POST_LINK = $(STRIP) --strip-unneeded $(TARGET)
diff --git a/app/main.cpp b/app/main.cpp
index 783d2f5..e7c0070 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -24,7 +24,6 @@
 #include <QtQuickControls2/QQuickStyle>
 #include <QQuickWindow>
 #include <libhomescreen.hpp>
-#include <qlibwindowmanager.h>
 
 #include <map.h>
 
@@ -33,6 +32,7 @@ int main(int argc, char *argv[])
     QString graphic_role = QString("messaging");
 
     QGuiApplication app(argc, argv);
+    app.setDesktopFileName(graphic_role);
 
     QQuickStyle::setStyle("AGL");
 
@@ -45,6 +45,7 @@ int main(int argc, char *argv[])
     parser.addVersionOption();
     parser.process(app);
     QStringList positionalArguments = parser.positionalArguments();
+
     if (positionalArguments.length() == 2) {
         int port = positionalArguments.takeFirst().toInt();
         QString secret = positionalArguments.takeFirst();
@@ -62,40 +63,7 @@ int main(int argc, char *argv[])
         Map *map = new Map(bindingAddress, context);
         context->setContextProperty("messaging", map);
 
-        LibHomeScreen* hs = new LibHomeScreen();
-        QLibWindowmanager* qwm = new QLibWindowmanager();
-
-        // WindowManager
-        if(qwm->init(port, secret) != 0){
-            exit(EXIT_FAILURE);
-        }
-
-        AGLScreenInfo screenInfo(qwm->get_scale_factor());
-
-        // Request a surface as described in layers.json windowmanager’s file
-        if (qwm->requestSurface(graphic_role) != 0) {
-            exit(EXIT_FAILURE);
-        }
-        // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs
-        qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, graphic_role](json_object *object) {
-	        Q_UNUSED(object);
-            qwm->endDraw(graphic_role);
-        });
-
-        // HomeScreen
-        hs->init(port, token.c_str());
-        // Set the event handler for Event_ShowWindow which will activate the surface for windowmanager
-        hs->set_event_handler(LibHomeScreen::Event_ShowWindow, [qwm, &graphic_role](json_object *object){
-            qDebug("Surface %s got showWindow\n", graphic_role.toStdString().c_str());
-            qwm->activateWindow(graphic_role);
-        });
-
-        engine.rootContext()->setContextProperty("screenInfo", &screenInfo);
         engine.load(QUrl(QStringLiteral("qrc:/Messaging.qml")));
-        QObject *root = engine.rootObjects().first();
-        QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
-        QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateWindow()
-        ));
     }
     return app.exec();
 }