Merge lp:~townsend/unity/fix-bfb-keynav-dash into lp:unity

Proposed by Christopher Townsend
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3957
Proposed branch: lp:~townsend/unity/fix-bfb-keynav-dash
Merge into: lp:unity
Diff against target: 39 lines (+15/-0)
1 file modified
launcher/LauncherController.cpp (+15/-0)
To merge this branch: bzr merge lp:~townsend/unity/fix-bfb-keynav-dash
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+256216@code.launchpad.net

Commit message

Send signal to ensure the Dash will show when entering keynav mode since the first icon always highlighted is the BFB.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/LauncherController.cpp'
2--- launcher/LauncherController.cpp 2015-03-20 16:23:04 +0000
3+++ launcher/LauncherController.cpp 2015-04-16 14:26:34 +0000
4@@ -1319,6 +1319,11 @@
5
6 if (selected)
7 {
8+ if (selected->GetIconType() == AbstractLauncherIcon::IconType::HOME)
9+ {
10+ pimpl->ubus.SendMessage(UBUS_DASH_ABOUT_TO_SHOW, NULL);
11+ }
12+
13 pimpl->ubus.SendMessage(UBUS_LAUNCHER_SELECTION_CHANGED,
14 glib::Variant(selected->tooltip_text()));
15 }
16@@ -1332,6 +1337,11 @@
17
18 if (selected)
19 {
20+ if (selected->GetIconType() == AbstractLauncherIcon::IconType::HOME)
21+ {
22+ pimpl->ubus.SendMessage(UBUS_DASH_ABOUT_TO_SHOW, NULL);
23+ }
24+
25 pimpl->ubus.SendMessage(UBUS_LAUNCHER_SELECTION_CHANGED,
26 glib::Variant(selected->tooltip_text()));
27 }
28@@ -1345,6 +1355,11 @@
29
30 if (selected)
31 {
32+ if (selected->GetIconType() == AbstractLauncherIcon::IconType::HOME)
33+ {
34+ pimpl->ubus.SendMessage(UBUS_DASH_ABOUT_TO_SHOW, NULL);
35+ }
36+
37 pimpl->ubus.SendMessage(UBUS_LAUNCHER_SELECTION_CHANGED,
38 glib::Variant(selected->tooltip_text()));
39 }