summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-11-15 20:15:54 +0900
committerKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-11-15 20:18:14 +0900
commit1406acd6b62734aa836c735303a8e78189407227 (patch)
treeefeca03bd190d42a1ca2a4177973d56211a7e183
parentdc32441c3a3316840a4efb22e92d3d277cfde70a (diff)
Modify graphic role
Window Manager set role name as lower_case, then change role as lower_case. Bug-AGL: SPEC-1754 Change-Id: Iac8d9dce808e4683d2541d1ef1ec6e14202c363a Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
-rw-r--r--app/main.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/app/main.cpp b/app/main.cpp
index 844913f..bdc0c5f 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -40,7 +40,7 @@
int main(int argc, char *argv[])
{
- QString myname = QString("Mixer");
+ QString graphic_role = QString("mixer");
QGuiApplication app(argc, argv);
@@ -84,22 +84,22 @@ int main(int argc, char *argv[])
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) {
+ if (qwm->requestSurface(graphic_role) != 0) {
exit(EXIT_FAILURE);
}
// Create an event callbnewack against an event type. Here a lambda is called when SyncDraw event occurs
- qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, myname](json_object*) {
+ qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, &graphic_role](json_object*) {
fprintf(stderr, "Surface got syncDraw!\n");
- qwm->endDraw(myname);
+ qwm->endDraw(graphic_role);
});
// 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){
- qDebug("Surface %s got tapShortcut\n", myname.toStdString().c_str());
- qwm->activateSurface(myname);
+ hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, &graphic_role](json_object *object){
+ qDebug("Surface %s got tapShortcut\n", graphic_role.toStdString().c_str());
+ qwm->activateWindow(graphic_role);
});
#endif
engine.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
window->setFlags(window->flags() & ~Qt::FramelessWindowHint); // Remove the borderless flag
window->setHeight(QGuiApplication::primaryScreen()->geometry().height());
#else
- QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()));
+ QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateWindow()));
#endif
}
else