aboutsummaryrefslogtreecommitdiffstats
path: root/launcher/src
diff options
context:
space:
mode:
Diffstat (limited to 'launcher/src')
-rw-r--r--launcher/src/applicationmodel.cpp9
-rw-r--r--launcher/src/main.cpp12
2 files changed, 7 insertions, 14 deletions
diff --git a/launcher/src/applicationmodel.cpp b/launcher/src/applicationmodel.cpp
index 17e38fb..090a300 100644
--- a/launcher/src/applicationmodel.cpp
+++ b/launcher/src/applicationmodel.cpp
@@ -60,10 +60,11 @@ ApplicationModel::Private::Private()
auto const id = jso["id"].toString();
auto const icon = get_icon_name(jso);
- if ( name != "launcher" &&
- name != "homescreen-2017" &&
- name != "homescreen" &&
- name != "OnScreenApp") {
+ // Hide HomeScreen icon itself
+ if (name != "launcher" &&
+ name != "homescreen-2017" &&
+ name != "homescreen" &&
+ !name.contains("OnScreen", Qt::CaseInsensitive)) {
this->data.append(AppInfo(icon, name, id));
}
diff --git a/launcher/src/main.cpp b/launcher/src/main.cpp
index 91a1d80..d79e880 100644
--- a/launcher/src/main.cpp
+++ b/launcher/src/main.cpp
@@ -124,16 +124,8 @@ int main(int argc, char *argv[])
homescreenHandler->init(port, token.toStdString().c_str());
homescreenHandler->set_event_handler(QLibHomeScreen::Event_TapShortcut, [layoutHandler, 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);
- layoutHandler->activateSurface(myname);
- }
- }
+ qDebug("Surface launcher got tapShortcut. \n");
+ layoutHandler->activateSurface(myname);
});
QUrl bindingAddress;