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

[Andrea Azzarone]

Makes rounded the last hud button,

== Problem ==
[hud] the last button is not rounded.

== Test ==
Unit test added for unity::hud::View::SetQueries

[Marco Trevisan (Treviño) (3v1n0)]

Everything's fine ;)

review: Approve

=== modified file 'hud/HudView.cpp'
--- hud/HudView.cpp	2012-05-07 00:49:31 +0000
+++ hud/HudView.cpp	2012-06-04 23:06:19 +0000
@@ -213,6 +213,12 @@
   return search_bar_->text_entry();
 }
 
+std::list<HudButton::Ptr> const& View::buttons() const
+{
+  return buttons_;
+}
+
+
 void View::SetQueries(Hud::Queries queries)
 {
   // early exit, if the user is key navigating on the hud, we don't want to set new
@@ -231,14 +237,14 @@
   buttons_.clear();
   button_views_->Clear();
   int found_items = 0;
-  for (auto query = queries.begin(); query != queries.end(); query++)
+  for (auto query : queries)
   {
     if (found_items >= 5)
       break;
 
     HudButton::Ptr button(new HudButton());
     buttons_.push_front(button);
-    button->SetQuery(*query);
+    button->SetQuery(query);
 
     button_views_->AddView(button.GetPointer(), 0, nux::MINOR_POSITION_LEFT);
 
@@ -246,24 +252,26 @@
       query_activated.emit(dynamic_cast<HudButton*>(view)->GetQuery());
     });
 
-    button->key_nav_focus_activate.connect([&](nux::Area *area) {
+    button->key_nav_focus_activate.connect([&](nux::Area* area) {
       query_activated.emit(dynamic_cast<HudButton*>(area)->GetQuery());
     });
 
-    button->key_nav_focus_change.connect([&](nux::Area *area, bool recieving, KeyNavDirection direction){
+    button->key_nav_focus_change.connect([&](nux::Area* area, bool recieving, KeyNavDirection direction){
       if (recieving)
         query_selected.emit(dynamic_cast<HudButton*>(area)->GetQuery());
     });
 
-    // You should never decrement end().  We should fix this loop.
-    button->is_rounded = (query == --(queries.end())) ? true : false;
-    button->fake_focused = (query == (queries.begin())) ? true : false;
-
     button->SetMinimumWidth(content_width);
-    found_items++;
+    ++found_items;
   }
+
   if (found_items)
+  {
+    buttons_.front()->is_rounded = true;
+    buttons_.back()->fake_focused = true;
     selected_button_ = 1;
+  }
+
 
   QueueRelayout();
   QueueDraw();

=== modified file 'hud/HudView.h'
--- hud/HudView.h	2012-05-07 00:49:31 +0000
+++ hud/HudView.h	2012-06-04 23:06:19 +0000
@@ -51,6 +51,7 @@
 
   void Relayout();
   nux::View* default_focus() const;
+  std::list<HudButton::Ptr> const& buttons() const;
 
   void SetQueries(Hud::Queries queries);
   void SetIcon(std::string icon_name, unsigned int tile_size, unsigned int size, unsigned int padding);

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-05-30 14:33:07 +0000
+++ tests/CMakeLists.txt	2012-06-04 23:06:19 +0000
@@ -204,6 +204,7 @@
                  test_main.cpp
                  test_lensview_impl.cpp
                  test_icon_loader.cpp
+                 test_hud_view.cpp
                  test_resultviewgrid.cpp
                  test_single_monitor_launcher_icon.cpp
                  test_switcher_controller.cpp
@@ -215,7 +216,10 @@
                  ${CMAKE_SOURCE_DIR}/dash/ResultView.cpp
                  ${CMAKE_SOURCE_DIR}/dash/ResultViewGrid.cpp
                  ${CMAKE_SOURCE_DIR}/hud/HudButton.cpp
+                 ${CMAKE_SOURCE_DIR}/hud/HudIcon.cpp
+                 ${CMAKE_SOURCE_DIR}/hud/HudIconTextureSource.cpp
                  ${CMAKE_SOURCE_DIR}/hud/HudPrivate.cpp
+                 ${CMAKE_SOURCE_DIR}/hud/HudView.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/AbstractLauncherIcon.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/CairoBaseWindow.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/DNDCollectionWindow.cpp
@@ -249,11 +253,16 @@
                  ${CMAKE_SOURCE_DIR}/unity-shared/DashStyle.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/IconLoader.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/IconRenderer.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/IconTexture.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/IconTextureSource.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/IMTextEntry.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/Introspectable.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/IntrospectableWrappers.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/JSONParser.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/OverlayRenderer.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/PanelStyle.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/SearchBar.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/SearchBarSpinner.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/StaticCairoText.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/TextureCache.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/Timer.cpp

=== added file 'tests/test_hud_view.cpp'
--- tests/test_hud_view.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_hud_view.cpp	2012-06-04 23:06:19 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3, as
+ * published by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the applicable version of the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of both the GNU Lesser General Public
+ * License version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ *
+ */
+
+#include <list>
+
+#include <gtest/gtest.h>
+
+#include <Nux/Nux.h>
+#include <NuxCore/ObjectPtr.h>
+
+#include "UnityCore/Hud.h"
+
+#include "hud/HudView.h"
+#include "unity-shared/DashStyle.h"
+#include "unity-shared/UnitySettings.h"
+using namespace unity;
+
+namespace
+{
+
+TEST(TestHudView, TestSetQueries)
+{
+  Settings unity_settings;
+  dash::Style dash_style;
+  nux::ObjectPtr<hud::View> view(new hud::View());
+
+  hud::Hud::Queries queries;
+  queries.push_back(hud::Query::Ptr(new hud::Query("1", "","", "", "", NULL)));
+  queries.push_back(hud::Query::Ptr(new hud::Query("2", "","", "", "", NULL)));
+  queries.push_back(hud::Query::Ptr(new hud::Query("3", "","", "", "", NULL)));
+  queries.push_back(hud::Query::Ptr(new hud::Query("4", "","", "", "", NULL)));
+  view->SetQueries(queries);
+
+  ASSERT_EQ(view->buttons().size(), 4);
+
+  auto it = view->buttons().begin();
+  EXPECT_EQ((*it)->label, "4");
+  EXPECT_TRUE((*it)->is_rounded);
+  EXPECT_FALSE((*it)->fake_focused);
+
+  it++;
+  EXPECT_EQ((*it)->label, "3");
+  EXPECT_FALSE((*it)->is_rounded);
+  EXPECT_FALSE((*it)->fake_focused);
+
+  it++;
+  EXPECT_EQ((*it)->label, "2");
+  EXPECT_FALSE((*it)->is_rounded);
+  EXPECT_FALSE((*it)->fake_focused);
+
+  it++;
+  EXPECT_EQ((*it)->label, "1");
+  EXPECT_FALSE((*it)->is_rounded);
+  EXPECT_TRUE((*it)->fake_focused);
+}
+
+}

=== modified file 'unity-shared/SearchBar.cpp'
--- unity-shared/SearchBar.cpp	2012-05-07 00:49:31 +0000
+++ unity-shared/SearchBar.cpp	2012-06-04 23:06:19 +0000
@@ -302,27 +302,29 @@
 
 void SearchBar::OnFontChanged(GtkSettings* settings, GParamSpec* pspec)
 {
-  gchar* font_name = NULL;
+  glib::String font_name;
   PangoFontDescription* desc;
   std::ostringstream font_desc;
 
   g_object_get(settings, "gtk-font-name", &font_name, NULL);
 
-  desc = pango_font_description_from_string(font_name);
-  pango_entry_->SetFontFamily(pango_font_description_get_family(desc));
-  pango_entry_->SetFontSize(PANGO_ENTRY_FONT_SIZE);
-  pango_entry_->SetFontOptions(gdk_screen_get_font_options(gdk_screen_get_default()));
-
-  font_desc << pango_font_description_get_family(desc) << " " << HINT_LABEL_FONT_STYLE << " " << HINT_LABEL_FONT_SIZE;
-  hint_->SetFont(font_desc.str().c_str());
-
-  font_desc.str("");
-  font_desc.clear();
-  font_desc << pango_font_description_get_family(desc) << " " << SHOW_FILTERS_LABEL_FONT_STYLE << " " << SHOW_FILTERS_LABEL_FONT_SIZE;
-  show_filters_->SetFont(font_desc.str().c_str());
-
-  pango_font_description_free(desc);
-  g_free(font_name);
+  desc = pango_font_description_from_string(font_name.Value());
+  if (desc)
+  {
+    pango_entry_->SetFontFamily(pango_font_description_get_family(desc));
+    pango_entry_->SetFontSize(PANGO_ENTRY_FONT_SIZE);
+    pango_entry_->SetFontOptions(gdk_screen_get_font_options(gdk_screen_get_default()));
+
+    font_desc << pango_font_description_get_family(desc) << " " << HINT_LABEL_FONT_STYLE << " " << HINT_LABEL_FONT_SIZE;
+    hint_->SetFont(font_desc.str().c_str());
+
+    font_desc.str("");
+    font_desc.clear();
+    font_desc << pango_font_description_get_family(desc) << " " << SHOW_FILTERS_LABEL_FONT_STYLE << " " << SHOW_FILTERS_LABEL_FONT_SIZE;
+    show_filters_->SetFont(font_desc.str().c_str());
+
+    pango_font_description_free(desc);
+  }
 }
 
 void SearchBar::OnSearchHintChanged()