Merge lp:~azzar1/unity/fix-919567 into lp:unity

[Andrea Azzarone]

Make sure that the dash searchbar doesn't lose the focus when clicking on an empty dash area (or an area that should not get the focus on mouse down).

SetAccepetKeyNavFocus is already tested in trunk.

UNBLOCK

[Mirco Müller (macslow)]

Even without this branch it already works with trunk. So why is this branch needed?

review: Needs Information

[Andrea Azzarone (azzar1)]

> Even without this branch it already works with trunk. So why is this branch
> needed?

To test it:
- Open the app lens
- Expand the filter bar
- Make sure the dash has the focus
- The cursor should blink
- Click (for example) between a filter expander and the All Button
  (for example between Type > and All)
- The cursor is still blinking.

[Mirco Müller (macslow)]

Works... add that description above as a manual-test and I'm good to approve it.

review: Needs Fixing

[Andrea Azzarone (azzar1)]

> Works... add that description above as a manual-test and I'm good to approve
> it.

Done.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Why not include a test for the other bug you've linked, that is, bug #923988?

Also - the fix for this bug seems more like a band aid than a real fix. Is the bug not that the text changes on unrelated events?

[Andrea Azzarone (azzar1)]

> Why not include a test for the other bug you've linked, that is, bug #923988?
>

I've updated the manual test for the moment.

> Also - the fix for this bug seems more like a band aid than a real fix. Is the
> bug not that the text changes on unrelated events?

The text changes because the dash bar loses the key focus.

[Mikkel Kamstrup Erlandsen (kamstrup)]

> > Also - the fix for this bug seems more like a band aid than a real fix. Is
> the
> > bug not that the text changes on unrelated events?
>
> The text changes because the dash bar loses the key focus.

Exactly. That is what I consider to be the real bug. This patch fixes the symptoms but not the cause :-)

[Andrea Azzarone (azzar1)]

> > > Also - the fix for this bug seems more like a band aid than a real fix. Is
> > the
> > > bug not that the text changes on unrelated events?
> >
> > The text changes because the dash bar loses the key focus.
>
> Exactly. That is what I consider to be the real bug. This patch fixes the
> symptoms but not the cause :-)

Then it's a general problem. We should create two bugs:

- The searchbar should not lose the focus when clicking on a filter button
- The searchbar text should not change when the searchbar loses the focus.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Agreed.

Code looks good to me.

review: Approve

=== modified file 'manual-tests/Dash.txt'
--- manual-tests/Dash.txt	2012-01-26 12:59:18 +0000
+++ manual-tests/Dash.txt	2012-01-31 08:47:28 +0000
@@ -10,6 +10,22 @@
 Outcome
   The dash disappears, and gedit is run. If nothing happens or the first
   command is run (in this case gcc), this test failed.
+ 
+
+Mouse down and search bar focus
+-------------------------------
+This test makes sure that the search bar doesn't lose the focus clicking into
+am emtpy area (or into a filter button).
+ 
+#. Open the app lens
+#. Expand the filter bar
+#. Make sure the dash has the focus
+#. The cursor should blink
+#. Click between a filter expander and the All Button (for example between Type > and All)
+   or into a filter button.
+
+Outcome
+The cursor is still blinking.
   
 
 Category headers focus

=== modified file 'plugins/unityshell/src/DashSearchBar.cpp'
--- plugins/unityshell/src/DashSearchBar.cpp	2012-01-26 15:06:38 +0000
+++ plugins/unityshell/src/DashSearchBar.cpp	2012-01-31 08:47:28 +0000
@@ -474,4 +474,4 @@
 }
 
 } // namespace dash
-} // namespace unity
\ No newline at end of file
+} // namespace unity

=== modified file 'plugins/unityshell/src/FilterBasicButton.cpp'
--- plugins/unityshell/src/FilterBasicButton.cpp	2012-01-26 15:06:38 +0000
+++ plugins/unityshell/src/FilterBasicButton.cpp	2012-01-31 08:47:28 +0000
@@ -36,33 +36,39 @@
 FilterBasicButton::FilterBasicButton(nux::TextureArea* image, NUX_FILE_LINE_DECL)
   : nux::ToggleButton(image, NUX_FILE_LINE_PARAM)
 {
-  InitTheme();
+  Init();
 }
 
 FilterBasicButton::FilterBasicButton(std::string const& label, NUX_FILE_LINE_DECL)
   : nux::ToggleButton(NUX_FILE_LINE_PARAM)
   , label_(label)
 {
-  InitTheme();
+  Init();
 }
 
 FilterBasicButton::FilterBasicButton(std::string const& label, nux::TextureArea* image, NUX_FILE_LINE_DECL)
   : nux::ToggleButton(image, NUX_FILE_LINE_PARAM)
   , label_(label)
 {
-  InitTheme();
+  Init();
 }
 
 FilterBasicButton::FilterBasicButton(NUX_FILE_LINE_DECL)
   : nux::ToggleButton(NUX_FILE_LINE_PARAM)
 {
-  InitTheme();
+  Init();
 }
 
 FilterBasicButton::~FilterBasicButton()
 {
 }
 
+void FilterBasicButton::Init()
+{
+  InitTheme();
+  SetAcceptKeyNavFocusOnMouseDown(false);
+}
+
 void FilterBasicButton::InitTheme()
 {
   if (!active_)
@@ -144,4 +150,4 @@
 }
 
 } // namespace dash
-} // namespace unity
\ No newline at end of file
+} // namespace unity

=== modified file 'plugins/unityshell/src/FilterBasicButton.h'
--- plugins/unityshell/src/FilterBasicButton.h	2012-01-10 14:09:12 +0000
+++ plugins/unityshell/src/FilterBasicButton.h	2012-01-31 08:47:28 +0000
@@ -46,6 +46,7 @@
   virtual long ComputeContentSize();
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
 
+  void Init();
   void InitTheme();
   void RedrawTheme(nux::Geometry const& geom, cairo_t* cr, nux::ButtonVisualState faked_state);
 

=== modified file 'plugins/unityshell/src/FilterExpanderLabel.cpp'
--- plugins/unityshell/src/FilterExpanderLabel.cpp	2012-01-26 15:06:38 +0000
+++ plugins/unityshell/src/FilterExpanderLabel.cpp	2012-01-31 08:47:28 +0000
@@ -93,6 +93,8 @@
   cairo_label_ = new nux::StaticText(label_.c_str(), NUX_TRACKER_LOCATION);
   cairo_label_->SetFontName("Ubuntu 10");
   cairo_label_->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, 1.0f));
+  cairo_label_->SetAcceptKeyNavFocusOnMouseDown(false);
+
   cairo_label_->mouse_down.connect(
     [&](int x, int y, unsigned long button_flags, unsigned long key_flag)
     {
@@ -174,4 +176,4 @@
 }
 
 } // namespace dash
-} // namespace unity
\ No newline at end of file
+} // namespace unity

=== modified file 'plugins/unityshell/src/FilterMultiRangeButton.cpp'
--- plugins/unityshell/src/FilterMultiRangeButton.cpp	2012-01-10 14:09:12 +0000
+++ plugins/unityshell/src/FilterMultiRangeButton.cpp	2012-01-31 08:47:28 +0000
@@ -45,6 +45,8 @@
   , side_(MultiRangeSide::CENTER)
 {
   InitTheme();
+  SetAcceptKeyNavFocusOnMouseDown(false);
+   
   state_change.connect(sigc::mem_fun(this, &FilterMultiRangeButton::OnActivated));
 }
 

=== modified file 'plugins/unityshell/src/FilterRatingsButton.cpp'
--- plugins/unityshell/src/FilterRatingsButton.cpp	2012-01-10 14:09:12 +0000
+++ plugins/unityshell/src/FilterRatingsButton.cpp	2012-01-31 08:47:28 +0000
@@ -36,6 +36,7 @@
   : nux::ToggleButton(NUX_FILE_LINE_PARAM)
 {
   InitTheme();
+  SetAcceptKeyNavFocusOnMouseDown(false);
 
   mouse_up.connect(sigc::mem_fun(this, &FilterRatingsButton::RecvMouseUp));
   mouse_drag.connect(sigc::mem_fun(this, &FilterRatingsButton::RecvMouseDrag));

=== modified file 'plugins/unityshell/src/FilterWidget.cpp'
--- plugins/unityshell/src/FilterWidget.cpp	2012-01-10 14:09:12 +0000
+++ plugins/unityshell/src/FilterWidget.cpp	2012-01-31 08:47:28 +0000
@@ -32,6 +32,7 @@
 FilterWidget::FilterWidget( NUX_FILE_LINE_DECL)
   : nux::View(NUX_FILE_LINE_PARAM)
 {
+  SetAcceptKeyNavFocusOnMouseDown(false);
 }
 
 } // namespace dash

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-01-30 19:21:52 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-01-31 08:47:28 +0000
@@ -156,6 +156,7 @@
   //OnEndFocus.connect   (sigc::mem_fun (this, &Launcher::exitKeyNavMode));
 
   CaptureMouseDownAnyWhereElse(true);
+  SetAcceptKeyNavFocusOnMouseDown(false);
 
   QuicklistManager& ql_manager = *(QuicklistManager::Default());
   ql_manager.quicklist_opened.connect(sigc::mem_fun(this, &Launcher::RecvQuicklistOpened));

=== modified file 'plugins/unityshell/src/LensBarIcon.cpp'
--- plugins/unityshell/src/LensBarIcon.cpp	2011-09-29 03:45:59 +0000
+++ plugins/unityshell/src/LensBarIcon.cpp	2012-01-31 08:47:28 +0000
@@ -39,6 +39,8 @@
   SetMaximumHeight(24);
   SetOpacity(inactive_opacity_);
 
+  SetAcceptKeyNavFocusOnMouseDown(false);
+
   active.changed.connect(sigc::mem_fun(this, &LensBarIcon::OnActiveChanged));
   mouse_enter.connect([&]
 (int, int, unsigned long, unsigned long) { QueueDraw(); });