delete application_name check in tap_shortcut event

[apps/mixer.git] / app / main.cpp

diff --git a/app/main.cpp b/app/main.cpp
index 60b2951..844913f 100644 (file)
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -70,8 +70,9 @@ int main(int argc, char *argv[])
                bindingAddress.setQuery(query);
                QQmlContext *context = engine.rootContext();
                context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
+               qDebug() << "Connect to: " << bindingAddress;
+
 
-               std::string token = secret.toStdString();
 #ifndef NATIVE_BUILD
                LibHomeScreen* hs = new LibHomeScreen();
                QLibWindowmanager* qwm = new QLibWindowmanager();
@@ -80,6 +81,8 @@ int main(int argc, char *argv[])
                if(qwm->init(port,secret) != 0){
                        exit(EXIT_FAILURE);
                }
+               AGLScreenInfo screenInfo(qwm->get_scale_factor());
+               engine.rootContext()->setContextProperty(QStringLiteral("screenInfo"), &screenInfo);
                // Request a surface as described in layers.json windowmanager’s file
                if (qwm->requestSurface(myname) != 0) {
                        exit(EXIT_FAILURE);
@@ -91,19 +94,12 @@ int main(int argc, char *argv[])
                        });
 
                // HomeScreen
+               std::string token = secret.toStdString();
                hs->init(port, token.c_str());
                // Set the event handler for Event_TapShortcut which will activate the surface for windowmanager
                hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, myname](json_object *object){
-                       json_object *appnameJ = nullptr;
-                       if(json_object_object_get_ex(object, "application_name", &appnameJ))
-                       {
-                               const char *appname = json_object_get_string(appnameJ);
-                               if(myname == appname)
-                               {
-                                       qDebug("Surface %s got tapShortcut\n", appname);
-                                       qwm->activateSurface(myname);
-                               }
-                       }
+                       qDebug("Surface %s got tapShortcut\n", myname.toStdString().c_str());
+                       qwm->activateSurface(myname);
                });
 #endif
                engine.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));