Merge lp:~nick-dedekind/unity/smart-scopes.dash-focus into lp:~unity-team/unity/libunity-7.0-breakage

Proposed by Nick Dedekind on 2013-03-25
Status: Merged
Approved by: Brandon Schaefer on 2013-03-25
Approved revision: 3100
Merged at revision: 3101
Proposed branch: lp:~nick-dedekind/unity/smart-scopes.dash-focus
Merge into: lp:~unity-team/unity/libunity-7.0-breakage
Diff against target: 45 lines (+0/-19)
2 files modified
dash/DashView.cpp (+0/-17)
dash/DashView.h (+0/-2)
To merge this branch: bzr merge lp:~nick-dedekind/unity/smart-scopes.dash-focus
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-03-25
Brandon Schaefer (community) 2013-03-25 Approve on 2013-03-25
Review via email: mp+155308@code.launchpad.net

Commit message

Now matches unity trunk dash focus mechanism.

Description of the change

Now matches unity trunk dash focus mechanism.

To post a comment you must log in.
Brandon Schaefer (brandontschaefer) wrote :

LGTM :)

review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dash/DashView.cpp'
2--- dash/DashView.cpp 2013-03-22 21:28:35 +0000
3+++ dash/DashView.cpp 2013-03-25 17:51:21 +0000
4@@ -1284,8 +1284,6 @@
5 search_bar_->can_refine_search = can_refine_search;
6 });
7
8- nux::GetWindowCompositor().SetKeyFocusArea(default_focus());
9-
10 view->QueueDraw();
11 QueueDraw();
12 }
13@@ -1647,20 +1645,5 @@
14 return content_geo_;
15 }
16
17-bool DashView::SetParentObject(Area *parent)
18-{
19- //This is a bit crap and should be fixed in nux.
20- //If you reparent, you need to fix up the focus tree.
21- if (View::SetParentObject(parent))
22- {
23- // Because the scopes are now created synchronously on construction, we wont be parented by the time the focus is updated.
24- InputArea* area = nux::GetWindowCompositor().GetKeyFocusArea();
25- if (area)
26- area->SetPathToKeyFocusArea();
27- return true;
28- }
29- return false;
30-}
31-
32 }
33 }
34
35=== modified file 'dash/DashView.h'
36--- dash/DashView.h 2013-03-22 12:44:53 +0000
37+++ dash/DashView.h 2013-03-25 17:51:21 +0000
38@@ -75,8 +75,6 @@
39
40 nux::Geometry const& GetContentGeometry() const;
41
42- virtual bool SetParentObject(Area *parent);
43-
44 protected:
45 void ProcessDndEnter();
46

Subscribers

People subscribed via source and target branches

to all changes: