Merge lp:~townsend/unity/fix-quicklist-reopen-new 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: 3973
Proposed branch: lp:~townsend/unity/fix-quicklist-reopen-new
Merge into: lp:unity
Diff against target: 33 lines (+12/-0)
2 files modified
launcher/QuicklistView.cpp (+10/-0)
launcher/QuicklistView.h (+2/-0)
To merge this branch: bzr merge lp:~townsend/unity/fix-quicklist-reopen-new
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+259631@code.launchpad.net

Commit message

Allow mouse clicks that are not in the visible area of the Quicklist to pass through down to the Launcher icon. Fixes a failing AP test.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'launcher/QuicklistView.cpp'
2--- launcher/QuicklistView.cpp 2015-03-20 16:23:04 +0000
3+++ launcher/QuicklistView.cpp 2015-05-20 15:32:09 +0000
4@@ -653,6 +653,16 @@
5 Hide();
6 }
7
8+nux::Area* QuicklistView::FindAreaUnderMouse(const nux::Point& mouse_position, nux::NuxEventType event_type)
9+{
10+ if (mouse_position.x > _anchorX)
11+ {
12+ return (CairoBaseWindow::FindAreaUnderMouse(mouse_position, event_type));
13+ }
14+
15+ return nullptr;
16+}
17+
18 void QuicklistView::RemoveAllMenuItem()
19 {
20 _item_layout->Clear();
21
22=== modified file 'launcher/QuicklistView.h'
23--- launcher/QuicklistView.h 2015-03-20 16:23:04 +0000
24+++ launcher/QuicklistView.h 2015-05-20 15:32:09 +0000
25@@ -62,6 +62,8 @@
26 void Hide();
27 void HideAndEndQuicklistNav();
28
29+ virtual nux::Area* FindAreaUnderMouse(const nux::Point& mouse_position, nux::NuxEventType event_type) override;
30+
31 int GetNumItems();
32 QuicklistMenuItem* GetNthItems(int index);
33 QuicklistMenuItemType GetNthType(int index);