diff options
| author |   Marius Vlad <marius.vlad@collabora.com> | 2020-05-29 13:30:15 +0300 |
|---|---|---|
| committer | Marius Vlad <marius.vlad@collabora.com> | 2020-06-24 17:05:32 +0300 |
| commit | fc41fa6da7f64262a7bbc4313b920762e1a31d15 (patch) | |
| tree | 377e945d5398863e4eb262b80a5e0d83da4dc4c4 /launcher/src/homescreenhandler.cpp | |
| parent | 259c66b9ebde64e857f36d8d1d7050bec2e8f41d (diff) | |
homescreenhandler: Add the ability to specify the output based on the
screen
Pass the output when activing the surface in Launcher.qml
Bug-AGL: SPEC-3447
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I4b8f03c90712290f580a570cd2644a4bc44687c5
Diffstat (limited to 'launcher/src/homescreenhandler.cpp')
| -rw-r--r-- | launcher/src/homescreenhandler.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/launcher/src/homescreenhandler.cpp b/launcher/src/homescreenhandler.cpp index 3c16c23..4d98414 100644 --- a/launcher/src/homescreenhandler.cpp +++ b/launcher/src/homescreenhandler.cpp @@ -172,7 +172,7 @@ void HomescreenHandler::init(int port, const char *token, QString myname) }); } -void HomescreenHandler::tapShortcut(QString application_id) +void HomescreenHandler::tapShortcut(QString application_id, QString output_name) { HMI_DEBUG("Launcher","tapShortcut %s", application_id.toStdString().c_str()); struct json_object* j_json = json_object_new_object(); @@ -181,7 +181,10 @@ void HomescreenHandler::tapShortcut(QString application_id) json_object_object_add(j_json, "area", value); mp_hs->showWindow(application_id.toStdString().c_str(), j_json); - aglShell->activate_app(nullptr, application_id, nullptr); + if (output_name.isEmpty()) + aglShell->activate_app(nullptr, application_id, nullptr); + else + aglShell->activate_app_by_screen(output_name, application_id, nullptr); } void HomescreenHandler::onRep_static(struct json_object* reply_contents) |