Unity

Merge lp:~njpatel/unity/more-fixes-2011-09-29 into lp:unity

  1. more-fixes-2011-09-29
  2. Merge into trunk
Proposed by Neil J. Patel
Status: Merged
Approved by: Gord Allott
Approved revision: no longer in the source branch.
Merged at revision: 1668
Proposed branch: lp:~njpatel/unity/more-fixes-2011-09-29
Merge into: lp:unity
Diff against target: 72 lines (+20/-0)
3 files modified
plugins/unityshell/src/DashController.cpp (+12/-0)
plugins/unityshell/src/DashView.cpp (+7/-0)
plugins/unityshell/src/DashView.h (+1/-0)
To merge this branch: bzr merge lp:~njpatel/unity/more-fixes-2011-09-29
Reviewer Review Type Date Requested Status
Sam Spilsbury (community) Approve
Gord Allott Pending
Review via email: mp+77534@code.launchpad.net

Description of the change

Bugs linked.

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/DashController.cpp'
2--- plugins/unityshell/src/DashController.cpp 2011-09-23 23:02:51 +0000
3+++ plugins/unityshell/src/DashController.cpp 2011-09-29 14:01:37 +0000
4@@ -21,6 +21,7 @@
5 #include <NuxCore/Logger.h>
6 #include <Nux/HLayout.h>
7
8+#include "DashSettings.h"
9 #include "PluginAdapter.h"
10 #include "UBusMessages.h"
11 #include "UScreen.h"
12@@ -51,12 +52,23 @@
13 PluginAdapter::Default()->compiz_screen_ungrabbed.connect(sigc::mem_fun(this, &DashController::OnScreenUngrabbed));
14
15 ensure_id_ = g_timeout_add_seconds(60, [] (gpointer data) -> gboolean { static_cast<DashController*>(data)->EnsureDash(); return FALSE; }, this);
16+
17+ DashSettings::GetDefault()->changed.connect([&]()
18+ {
19+ if (window_)
20+ {
21+ window_->PushToFront();
22+ window_->SetInputFocus();
23+ nux::GetWindowCompositor().SetKeyFocusArea(view_->default_focus());
24+ }
25+ });
26 }
27
28 DashController::~DashController()
29 {
30 if (window_)
31 window_->UnReference();
32+ window_ = 0;
33 g_source_remove(timeline_id_);
34 g_source_remove(ensure_id_);
35 }
36
37=== modified file 'plugins/unityshell/src/DashView.cpp'
38--- plugins/unityshell/src/DashView.cpp 2011-09-29 08:16:37 +0000
39+++ plugins/unityshell/src/DashView.cpp 2011-09-29 14:01:37 +0000
40@@ -676,6 +676,7 @@
41
42 lens->activated.connect(sigc::mem_fun(this, &DashView::OnUriActivatedReply));
43 lens->search_finished.connect(sigc::mem_fun(this, &DashView::OnSearchFinished));
44+ lens->global_search_finished.connect(sigc::mem_fun(this, &DashView::OnGlobalSearchFinished));
45 }
46
47 void DashView::OnLensBarActivated(std::string const& id)
48@@ -717,6 +718,12 @@
49 search_bar_->SearchFinished();
50 }
51
52+void DashView::OnGlobalSearchFinished(std::string const& search_string)
53+{
54+ if (active_lens_view_ == home_view_)
55+ OnSearchFinished(search_string);
56+}
57+
58 void DashView::OnUriActivated(std::string const& uri)
59 {
60 last_activated_uri_ = uri;
61
62=== modified file 'plugins/unityshell/src/DashView.h'
63--- plugins/unityshell/src/DashView.h 2011-09-28 17:17:45 +0000
64+++ plugins/unityshell/src/DashView.h 2011-09-29 14:01:37 +0000
65@@ -87,6 +87,7 @@
66 void OnLensAdded(Lens::Ptr& lens);
67 void OnLensBarActivated(std::string const& id);
68 void OnSearchFinished(std::string const& search_string);
69+ void OnGlobalSearchFinished(std::string const& search_string);
70 void OnUriActivated(std::string const& uri);
71 void OnUriActivatedReply(std::string const& uri, HandledType type, Lens::Hints const&);
72 bool DoFallbackActivation(std::string const& uri);