X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2Fmain.cpp;h=0bfdd52920bc537d75bc7289889f1330b98c3f65;hb=refs%2Ftags%2Fflounder_5.99.3;hp=211f52b250eaa0f436f1ef1fbe7ab14b0053c9d2;hpb=4b7d58e71e8864a90d3b567f21029968d6e8edef;p=apps%2Fhvac.git diff --git a/app/main.cpp b/app/main.cpp index 211f52b..0bfdd52 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -75,6 +75,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); @@ -94,16 +96,8 @@ int main(int argc, char *argv[]) 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