From bf3c9fb7ae0f39d6df454807dcfaccc97715fbcf Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Wed, 15 Nov 2017 11:56:17 +0900 Subject: Change libwindowmanager to qlibwindowmanager Since qlibwindowmanager set environment QT_IVI_SURFACE_ID, and libwindowmanager remove setenv. HomeScreen need use qlibwindowmanager instead of libwindowmanager. Change-Id: I0d0babff168fe0cecb2ff689605df1f9bbc2c400 Signed-off-by: zheng_wenlong --- homescreen/src/main.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'homescreen/src/main.cpp') diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp index 45a7c0f..e0850d6 100644 --- a/homescreen/src/main.cpp +++ b/homescreen/src/main.cpp @@ -23,7 +23,7 @@ #include #include -#include "layouthandler.h" +#include #include "applicationlauncher.h" #include "statusbarmodel.h" #include "applicationmodel.h" @@ -96,8 +96,18 @@ int main(int argc, char *argv[]) qDBusRegisterMetaType(); qDBusRegisterMetaType >(); - LayoutHandler* layoutHandler = new LayoutHandler(); - layoutHandler->init(port, token.toStdString().c_str()); + QLibWindowmanager* layoutHandler = new QLibWindowmanager(); + if(layoutHandler->init(port,token) != 0){ + exit(EXIT_FAILURE); + } + + if (layoutHandler->requestSurface(QString("HomeScreen")) != 0) { + exit(EXIT_FAILURE); + } + + layoutHandler->set_event_handler(QLibWindowmanager::Event_SyncDraw, [layoutHandler](json_object *object) { + layoutHandler->endDraw(QString("HomeScreen")); + }); HomescreenHandler* homescreenHandler = new HomescreenHandler(); homescreenHandler->init(port, token.toStdString().c_str()); @@ -111,7 +121,6 @@ int main(int argc, char *argv[]) QObject *root = engine.rootObjects().first(); QQuickWindow *window = qobject_cast(root); QObject::connect(window, SIGNAL(frameSwapped()), layoutHandler, SLOT(slotActivateSurface())); - QObject::connect(homescreenHandler, SIGNAL(homeButton()), layoutHandler, SLOT(slotHomeButton())); return a.exec(); } -- cgit 1.2.3-korg