summaryrefslogtreecommitdiffstats
path: root/homescreen/src/main.cpp
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2020-07-22 22:27:21 -0400
committerScott Murray <scott.murray@konsulko.com>2020-07-22 22:39:25 -0400
commita37400d73417dc02511813833b8f4d9b91e40a11 (patch)
treea5ee5964d970fba4c377bd4d697be91dc43d8133 /homescreen/src/main.cpp
parentbdcd052f995d46abeeeda3171759aabad7dd8a75 (diff)
The switch to the new compositor removed the callback to update the top panel button highlight since it was being driven by the Event_ScreenUpdated event from the old windowmanager. For now, work around this by driving the ApplicationLauncher's setCurrent method from the appropriate place in the HomescreenHandler object's tapShortcut method. If a generic mechanism for notifications on application expose becomes available via agl-shell-desktop, that should be used instead. Additionally, add an explicit call to setCurrent on initialization to highlight the top panel Launcher button, matching the actual initial UI state. Bug-AGL: SPEC-3510 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ied5dd8e78195d061585510e60a758559ca4f69b3
Diffstat (limited to 'homescreen/src/main.cpp')
-rw-r--r--homescreen/src/main.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp
index 742daa6..8c7bb22 100644
--- a/homescreen/src/main.cpp
+++ b/homescreen/src/main.cpp
@@ -234,15 +234,14 @@ int main(int argc, char *argv[])
Shell *aglShell = new Shell(shell, &a);
// import C++ class to QML
- // qmlRegisterType<ApplicationLauncher>("HomeScreen", 1, 0, "ApplicationLauncher");
qmlRegisterType<StatusBarModel>("HomeScreen", 1, 0, "StatusBarModel");
qmlRegisterType<MasterVolume>("MasterVolume", 1, 0, "MasterVolume");
qmlRegisterUncreatableType<ChromeController>("SpeechChrome", 1, 0, "SpeechChromeController",
QLatin1String("SpeechChromeController is uncreatable."));
ApplicationLauncher *launcher = new ApplicationLauncher();
-
- HomescreenHandler* homescreenHandler = new HomescreenHandler(aglShell);
+ launcher->setCurrent(QStringLiteral("launcher"));
+ HomescreenHandler* homescreenHandler = new HomescreenHandler(aglShell, launcher);
homescreenHandler->init(port, token.toStdString().c_str());
QUrl bindingAddress;