Merge lp:~gordallott/unity/keynav-fixes-11-03-10 into lp:unity

[Gord Allott]

Bunch of keynav fixes - still a few issues;

Can't click to focus the search bar anymore, not sure why, but as a consequence you don't get a cursor
when keynav is used on a group that has more items than are visible, you can navigate "into" that group, effectively losing focus on your keynav - should be fixed once groups are updated to not create more items than they can fit or groups at least make the items return false on IsVisible (); - unity bug not a keynav one
Keynav doesn't scroll the window
Combo-box isn't supported so you can't keynav to that yet.

requires https://code.launchpad.net/~gordallott/nux/keynav-fixes-11-03-10/+merge/52842

[Neil J. Patel (njpatel)]

Very, very cool, works well and we can fix the remaining things for next week. Approved.

review: Approve

=== modified file 'src/IconTexture.cpp'
--- src/IconTexture.cpp	2011-03-01 09:22:43 +0000
+++ src/IconTexture.cpp	2011-03-10 15:06:55 +0000
@@ -46,6 +46,7 @@
     LoadIcon ();
 
   _can_pass_focus_to_composite_layout = false;
+  SetCanFocus (false);
 }
 
 IconTexture::~IconTexture ()
@@ -187,7 +188,7 @@
 }
 
 bool
-IconTexture::CanFocus ()
+IconTexture::DoCanFocus ()
 {
   return false;
 }
 
=== modified file 'src/IconTexture.h'
--- src/IconTexture.h	2011-02-28 16:49:11 +0000
+++ src/IconTexture.h	2011-03-10 15:06:55 +0000
@@ -42,7 +42,8 @@
 protected:
   const gchar* GetName ();
   void AddProperties (GVariantBuilder *builder);
-
+  virtual bool DoCanFocus ();
+  
 private:
   void Draw (nux::GraphicsEngine& GfxContext, bool force_draw);
 
@@ -53,8 +54,6 @@
   char *_icon_name;
   unsigned int _size;
 
-  virtual bool CanFocus ();
-
   GdkPixbuf        *_pixbuf_cached;
   nux::BaseTexture *_texture_cached;
   int               _texture_width;
 
=== modified file 'src/PlacesGroup.cpp'
--- src/PlacesGroup.cpp	2011-03-07 10:40:56 +0000
+++ src/PlacesGroup.cpp	2011-03-10 15:06:55 +0000
@@ -58,7 +58,8 @@
 {
   PlacesStyle *style = PlacesStyle::GetDefault ();
   nux::BaseTexture *arrow = style->GetGroupUnexpandIcon ();
-
+  
+  _cached_name = NULL;
   _group_layout = new nux::VLayout ("", NUX_TRACKER_LOCATION);
 
   _header_layout = new nux::HLayout (NUX_TRACKER_LOCATION);
@@ -77,11 +78,17 @@
   _expand_label->SetTextEllipsize (nux::StaticCairoText::NUX_ELLIPSIZE_END);
   _expand_label->SetTextAlignment (nux::StaticCairoText::NUX_ALIGN_LEFT);
   _expand_label->SetTextColor (kExpandDefaultTextColor);
+  _expand_label->SetCanFocus (true);
+  _expand_label->FocusActivated.connect (sigc::mem_fun (this, &PlacesGroup::OnLabelActivated));
+  _expand_label->FocusChanged.connect (sigc::mem_fun (this, &PlacesGroup::OnLabelFocusChanged));
+  
+  
   _header_layout->AddView (_expand_label, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
 
   _expand_icon = new nux::TextureArea ();
   _expand_icon->SetTexture (arrow);
   _expand_icon->SetMinimumSize (arrow->GetWidth (), arrow->GetHeight ());
+  _expand_icon->SetCanFocus (false);
   _header_layout->AddView (_expand_icon, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
 
   SetLayout (_group_layout);
@@ -107,17 +114,39 @@
 }
 
 void
+PlacesGroup::OnLabelActivated (nux::Area *label)
+{
+  SetExpanded (!_is_expanded);
+}
+
+void
+PlacesGroup::OnLabelFocusChanged (nux::Area *label)
+{
+  RefreshLabel ();
+}
+void
 PlacesGroup::SetName (const char *name)
 {
   // Spaces are on purpose, want padding to be proportional to the size of the text
   // Bear with me, I'm trying something different :)
   const gchar *temp = "    <big>%s</big>    ";
-  gchar *tmp, *final;
+  const gchar *temp_focused = "    <big><b>%s</b></big>    ";
+  gchar *tmp = NULL;
+  gchar *final = NULL; 
+  if (_cached_name != NULL)
+  {
+    g_free (_cached_name);
+  }
+  
+  _cached_name = g_strdup (name);
 
   tmp = g_markup_escape_text (name, -1);
 
-  final = g_strdup_printf (temp, tmp);
-
+  if (_expand_label->GetFocused ())
+    final = g_strdup_printf (temp_focused, tmp);
+  else
+    final = g_strdup_printf (temp, tmp);
+  
   _name->SetText (final);
 
   g_free (tmp);
@@ -149,7 +178,7 @@
 }
 
 void
-PlacesGroup::Refresh ()
+PlacesGroup::RefreshLabel ()
 {
   const char *temp = "<small>%s</small>";
   char       *result_string;
@@ -166,26 +195,38 @@
   else
   {
     result_string = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE,
-                                           "See one more result",
-                                           "See %d more results",
-                                           _n_total_items - _n_visible_items_in_unexpand_mode),
+                                                  "See one more result",
+                                                  "See %d more results",
+                                                  _n_total_items - _n_visible_items_in_unexpand_mode),
                                      _n_total_items - _n_visible_items_in_unexpand_mode);
   }
-
+  
   _expand_icon->SetVisible (!(_n_visible_items_in_unexpand_mode >= _n_total_items && _n_total_items != 0));
 
+  char *tmpname = g_strdup (_cached_name);
+  SetName (tmpname);
+  g_free (tmpname);
+
   final = g_strdup_printf (temp, result_string);
-
+  
   _expand_label->SetText (final);
   _expand_label->SetVisible (_n_visible_items_in_unexpand_mode < _n_total_items);
 
+  QueueDraw ();
+
+  g_free ((result_string));
+  g_free (final);
+}
+
+void
+PlacesGroup::Refresh ()
+{
+  RefreshLabel ();
   ComputeChildLayout ();
   QueueDraw ();
-
-  g_free ((result_string));
-  g_free (final);
 }
 
+
 void
 PlacesGroup::Relayout ()
 {
@@ -203,6 +244,12 @@
   self->ComputeChildLayout ();
   self->_idle_id = 0;
 
+  if (self->GetFocused ())
+  {
+    self->SetFocused (false); // unset focus on all children
+    self->SetFocused (true); // set focus on first child
+  }
+
   return FALSE;
 }
 
 
=== modified file 'src/PlacesGroup.h'
--- src/PlacesGroup.h	2011-03-06 17:40:56 +0000
+++ src/PlacesGroup.h	2011-03-10 15:06:55 +0000
@@ -65,6 +65,9 @@
   void RecvMouseClick (int x, int y, unsigned long button_flags, unsigned long key_flags);
   void RecvMouseEnter (int x, int y, unsigned long button_flags, unsigned long key_flags);
   void RecvMouseLeave (int x, int y, unsigned long button_flags, unsigned long key_flags);
+  void OnLabelActivated (nux::Area *label);
+  void OnLabelFocusChanged (nux::Area *label);
+  void RefreshLabel ();
 
 private:
   nux::VLayout *_group_layout;
@@ -81,6 +84,7 @@
   bool  _is_expanded;
   guint _n_visible_items_in_unexpand_mode;
   guint _n_total_items;
+  char *_cached_name;
 };
 
 #endif
 
=== modified file 'src/PlacesResultsView.cpp'
--- src/PlacesResultsView.cpp	2011-02-28 16:49:11 +0000
+++ src/PlacesResultsView.cpp	2011-03-10 15:06:55 +0000
@@ -41,6 +41,7 @@
 
   EnableVerticalScrollBar (true);
   EnableHorizontalScrollBar (false);
+  _idle_id = 0;
 }
 
 PlacesResultsView::~PlacesResultsView ()
@@ -55,8 +56,24 @@
   ResetScrollToUp ();
   _groups.push_back (group);
   _layout->AddView (group, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+  
+  if (_idle_id == 0)
+    _idle_id = g_idle_add ((GSourceFunc)OnIdleFocus, this);
 }
 
+gboolean
+PlacesResultsView::OnIdleFocus (PlacesResultsView *self)
+{
+  self->_idle_id = 0;
+  
+  if (self->GetFocused ())
+  {
+    self->SetFocused (false); // unset focus on all children
+    self->SetFocused (true); // set focus on first child
+  }
+  
+  return FALSE;
+}
 void
 PlacesResultsView::RemoveGroup (PlacesGroup *group)
 {
@@ -64,6 +81,8 @@
   ResetScrollToUp ();
   _groups.remove (group);
   _layout->RemoveChildObject (group);
+  if (_idle_id == 0)
+    _idle_id = g_idle_add ((GSourceFunc)OnIdleFocus, this);
 }
 
 void
 
=== modified file 'src/PlacesResultsView.h'
--- src/PlacesResultsView.h	2011-02-28 10:08:19 +0000
+++ src/PlacesResultsView.h	2011-03-10 15:06:55 +0000
@@ -54,6 +54,8 @@
 private:
   nux::Layout *_layout;
   std::list<PlacesGroup *> _groups;
+  uint _idle_id;
+  static gboolean OnIdleFocus (PlacesResultsView *self);
 };
 
 #endif // PLACE_RESULTS_VIEW_H
 
=== modified file 'src/PlacesSearchBar.cpp'
--- src/PlacesSearchBar.cpp	2011-03-08 18:01:39 +0000
+++ src/PlacesSearchBar.cpp	2011-03-10 15:06:55 +0000
@@ -65,15 +65,18 @@
   _search_icon->SetMinMaxSize (icon->GetWidth (), icon->GetHeight ());
   _layout->AddView (_search_icon, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
   _search_icon->OnMouseClick.connect (sigc::mem_fun (this, &PlacesSearchBar::OnClearClicked));
+  _search_icon->SetCanFocus (false);
 
   _layered_layout = new nux::LayeredLayout ();
 
   _hint = new nux::StaticCairoText (" ");
   _hint->SetTextColor (nux::Color (1.0f, 1.0f, 1.0f, 0.5f));
+  _hint->SetCanFocus (false);
   _layered_layout->AddLayer (_hint);
 
   _pango_entry = new nux::TextEntry ("", NUX_TRACKER_LOCATION);
   _pango_entry->sigTextChanged.connect (sigc::mem_fun (this, &PlacesSearchBar::OnSearchChanged));
+  _pango_entry->SetCanFocus (true);
   _pango_entry->activated.connect (sigc::mem_fun (this, &PlacesSearchBar::OnEntryActivated));
   _layered_layout->AddLayer (_pango_entry);
 
@@ -87,6 +90,7 @@
   _combo->SetVisible (false);
   _combo->sigTriggered.connect (sigc::mem_fun (this, &PlacesSearchBar::OnComboChanged));
   _combo->GetMenuPage ()->sigMouseDownOutsideMenuCascade.connect (sigc::mem_fun (this, &PlacesSearchBar::OnMenuClosing));
+  _combo->SetCanFocus (false); // NOT SUPPORTING THIS QUITE YET
   _layout->AddView (_combo, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
 
   _layout->SetVerticalExternalMargin (18);
@@ -119,12 +123,6 @@
   return "";
 }
 
-bool
-PlacesSearchBar::CanFocus ()
-{
-  return false;
-}
-
 void PlacesSearchBar::AddProperties (GVariantBuilder *builder)
 {
   nux::Geometry geo = GetGeometry ();
 
=== modified file 'src/PlacesSearchBar.h'
--- src/PlacesSearchBar.h	2011-03-08 18:01:39 +0000
+++ src/PlacesSearchBar.h	2011-03-10 15:06:55 +0000
@@ -57,8 +57,6 @@
   sigc::signal<void, const char *> search_changed;
   sigc::signal<void> activated;
 
-  bool CanFocus ();
-
 protected:
   // Introspectable methods
   const gchar * GetName ();
 
=== modified file 'src/PlacesTile.cpp'
--- src/PlacesTile.cpp	2011-03-09 14:13:41 +0000
+++ src/PlacesTile.cpp	2011-03-10 15:06:55 +0000
@@ -41,6 +41,7 @@
   OnMouseEnter.connect (sigc::mem_fun (this, &PlacesTile::RecvMouseEnter));
   OnMouseLeave.connect (sigc::mem_fun (this, &PlacesTile::RecvMouseLeave));
   FocusChanged.connect (sigc::mem_fun (this, &PlacesTile::OnFocusChanged));
+  FocusActivated.connect (sigc::mem_fun (this, &PlacesTile::OnFocusActivated));
   _can_pass_focus_to_composite_layout = false;
 }
 
@@ -349,3 +350,9 @@
 {
   QueueDraw ();
 }
+
+void
+PlacesTile::OnFocusActivated (nux::Area *area)
+{
+  sigClick.emit (this);
+}
 
=== modified file 'src/PlacesTile.h'
--- src/PlacesTile.h	2011-03-09 14:13:41 +0000
+++ src/PlacesTile.h	2011-03-10 15:06:55 +0000
@@ -40,7 +40,7 @@
 
 protected:
   virtual nux::Geometry GetHighlightGeometry ();
-
+  
 private:
   void Draw (nux::GraphicsEngine &GfxContext, bool force_draw);
   void DrawContent (nux::GraphicsEngine &GfxContext, bool force_draw);
@@ -69,7 +69,7 @@
   nux::TextureLayer *_hilight_layer;
 
   void OnFocusChanged (nux::Area *area);
-
+  void OnFocusActivated (nux::Area *area);
   int _last_width;
   int _last_height;
 
 
=== modified file 'src/PlacesView.cpp'
--- src/PlacesView.cpp	2011-03-09 19:57:01 +0000
+++ src/PlacesView.cpp	2011-03-10 15:06:55 +0000
@@ -303,11 +303,13 @@
   _group_added_conn = _entry->group_added.connect (sigc::mem_fun (this, &PlacesView::OnGroupAdded));
   _result_added_conn = _entry->result_added.connect (sigc::mem_fun (this, &PlacesView::OnResultAdded));
   _result_removed_conn = _entry->result_removed.connect (sigc::mem_fun (this, &PlacesView::OnResultRemoved));
-
+  
   if (_entry == _home_entry && (g_strcmp0 (search_string, "") == 0))
     _layered_layout->SetActiveLayer (_home_view);
   else
     _layered_layout->SetActiveLayer (_results_view);
+
+  
 }
 
 PlaceEntry *
@@ -605,6 +607,18 @@
 
   self->PlaceEntryActivateRequest (id, section, search_string);
 
+  if (self->GetFocused ())
+  {
+    // reset the focus
+    self->SetFocused (false);
+    self->SetFocused (true);
+  }
+  else
+  {
+    // Not focused but we really should be
+    self->SetFocused (true);
+  }
+
   g_free (id);
   g_free (search_string);
 }
 
=== modified file 'src/StaticCairoText.cpp'
--- src/StaticCairoText.cpp	2011-02-28 16:27:57 +0000
+++ src/StaticCairoText.cpp	2011-03-10 15:06:55 +0000
@@ -50,6 +50,7 @@
   _ellipsize = NUX_ELLIPSIZE_END;
   _align = NUX_ALIGN_LEFT;
   _fontstring = NULL;
+  SetCanFocus (false);
 }
 
 StaticCairoText::~StaticCairoText ()
@@ -477,9 +478,4 @@
   self->sigFontChanged.emit (self);
 }
 
-bool StaticCairoText::CanFocus ()
-{
-  return false;
-}
-
 }
 
=== modified file 'src/StaticCairoText.h'
--- src/StaticCairoText.h	2011-02-28 16:27:57 +0000
+++ src/StaticCairoText.h	2011-03-10 15:06:55 +0000
@@ -89,7 +89,6 @@
       sigc::signal<void, StaticCairoText*> sigTextChanged;
       sigc::signal<void, StaticCairoText*> sigTextColorChanged;
       sigc::signal<void, StaticCairoText*> sigFontChanged;
-      virtual bool CanFocus ();
 
     private:
       int            _cached_extent_width;
 
=== modified file 'tests/TestPlaces.cpp'
--- tests/TestPlaces.cpp	2011-02-28 23:17:14 +0000
+++ tests/TestPlaces.cpp	2011-03-10 15:06:55 +0000
@@ -46,6 +46,8 @@
     _combo = new nux::ComboBoxSimple (NUX_TRACKER_LOCATION);
     _combo->SetMinimumWidth (150);
     _combo->sigTriggered.connect (sigc::mem_fun (this, &TestApp::OnComboChangedFoRealz));
+    _combo->SetCanFocus (false);
+    g_debug ("can we focus? %s", _combo->CanFocus () ? "yes :(" : "no! :D");
     layout->AddView (_combo, 0, nux::eCenter, nux::eFix);
 
     _factory = PlaceFactory::GetDefault ();