fix with homescreensandbox/zheng_wenlong/tbtnavi

1 files changed, 9 insertions, 18 deletions

diff --git a/app/main.cpp b/app/main.cpp
index 6194c25..5591afd 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -69,24 +69,15 @@ int main(int argc, char *argv[])
     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(QString::compare(myname, appname, Qt::CaseInsensitive) == 0)
-            {
-                qDebug("Surface %s got tapShortcut\n", appname);
-                json_object *para, *area;
-                json_object_object_get_ex(object, "parameter", &para);
-                json_object_object_get_ex(para, "area", &area);
-                const char *displayArea = json_object_get_string(area);
-                qDebug("Surface %s got tapShortcut area\n", displayArea);
-//                qwm->activateWindow(myname, QString(QLatin1String(displayArea)));
-                qwm->activateWindow(myname, "master.split.sub");
-            }
-        }
+    hs->set_event_handler(LibHomeScreen::Event_ShowWindow, [qwm, myname](json_object *object){
+        qDebug("Surface tbtnavi got Event_ShowWindow.\n");
+        json_object *para, *area;
+        json_object_object_get_ex(object, "parameter", &para);
+        json_object_object_get_ex(para, "area", &area);
+        const char *displayArea = json_object_get_string(area);
+        qDebug("Surface %s got tapShortcut area\n", displayArea);
+//        qwm->activateWindow(myname, QString(QLatin1String(displayArea)));
+        qwm->activateWindow(myname, "master.split.sub");
     });
 #endif
     qmlRegisterType<QCheapRuler>("com.mapbox.cheap_ruler", 1, 0, "CheapRuler");