Merge lp:~thumper/unity/hud-text into lp:unity

[Tim Penhey]

= The problem =

The initial work on the hud had the results from the hud service being shown directly. The hud service uses the <b> tag to indicate search matches.

The design, https://launchpadlibrarian.net/93965245/Pangolin_matrix_v1-3e.png had transparent text for not match parts.

= The solution =

Unfortunately we are not able to render transparency in the text at this stage due to limitations in the cairo methods we use. So what we do is to reformat the query strings in the hud service to use grey for the non-match parts.

= Tests =

./tests/test-gtest-xless --gtest_filter=TestHudText*

Screenshot: http://ubuntuone.com/2Zo5aiVDbZM5XooJyx0TKp

[Tim Penhey (thumper)]

Hmm... I'm really not convinced that this is the best solution.

Perhaps we should refactor the display of the HudButton code to use a combination of StaticCairoText objects to render the text to get proper transparency.

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

Yes, I agree... We should improve the View, or it won't look as it should.
However this look fine for now, even if I'd maybe use a lighter gray color.

Unmerged revisions

2367. By Tim Penhey on 2012-05-20

More tests, and the implementation.

2366. By Tim Penhey on 2012-05-18

And a failing test.

2365. By Tim Penhey on 2012-05-18

Step one.

2364. By Tim Penhey on 2012-05-18

Add the base function.

2363. By Tim Penhey on 2012-05-18

Added a bare test.

=== modified file 'UnityCore/Hud.cpp'
--- UnityCore/Hud.cpp	2012-04-16 12:11:01 +0000
+++ UnityCore/Hud.cpp	2012-05-20 22:40:25 +0000
@@ -19,6 +19,8 @@
 //
 #include "Hud.h"
 
+#include <sstream>
+
 #include <gio/gio.h>
 #include <glib.h>
 #include <NuxCore/Logger.h>
@@ -33,13 +35,58 @@
 {
 namespace hud
 {
-
 namespace
 {
 nux::logging::Logger logger("unity.hud.hud");
 const int request_number_of_results = 6;
 }
 
+std::string reformat_hud_text(std::string const& text,
+                              std::string const& colour)
+{
+  static const std::string bold_start("<b>");
+  static const std::string bold_end("</b>");
+  static const std::string span_end("</span>");
+  const std::string span_start("<span color=\"" + colour + "\">");
+
+  std::ostringstream sout;
+  std::string::size_type last = 0;
+  std::string::size_type len = text.length();
+  std::string::size_type pos = text.find(bold_start);
+
+  while (pos != std::string::npos)
+  {
+    if (pos != last)
+    {
+      sout << span_start << text.substr(last, pos - last) << span_end;
+    }
+    // Look for the end
+    std::string::size_type end_pos = text.find(bold_end, pos);
+    // We hope we find it, if we don't, just output everything...
+    if (end_pos != std::string::npos)
+    {
+      pos += 3; // to skip the "<b>"
+      sout << text.substr(pos, end_pos - pos);
+      last = end_pos + 4; // the length of "</b>"
+      pos = text.find(bold_start, last);
+    }
+    else
+    {
+      sout << text.substr(pos);
+      pos = std::string::npos;
+      last = len;
+    }
+  }
+
+  if (last < len)
+  {
+    sout << span_start << text.substr(last) << span_end;
+  }
+
+  return sout.str();
+}
+
+
 // Impl classes
 class HudImpl
 {
@@ -157,6 +204,8 @@
 
 void HudImpl::BuildQueries(GVariant* query_array)
 {
+  static const std::string GREY("#AAAAAA");
+
   GVariantIter iter;
   g_variant_iter_init(&iter, query_array);
   gchar* formatted_text;
@@ -169,7 +218,8 @@
   while (g_variant_iter_loop(&iter, "(sssssv)",
          &formatted_text, &icon, &item_icon, &completion_text, &shortcut, &key))
   {
-    queries_.push_back(Query::Ptr(new Query(formatted_text,
+    std::string invert_bold(reformat_hud_text(formatted_text, GREY));
+    queries_.push_back(Query::Ptr(new Query(invert_bold,
                                             icon,
                                             item_icon,
                                             completion_text,

=== modified file 'UnityCore/Hud.h'
--- UnityCore/Hud.h	2012-03-06 09:51:29 +0000
+++ UnityCore/Hud.h	2012-05-20 22:40:25 +0000
@@ -30,7 +30,8 @@
 {
 namespace hud
 {
-
+std::string reformat_hud_text(std::string const& text,
+                              std::string const& colour);
 
 class Query
 {

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-05-15 18:54:33 +0000
+++ tests/CMakeLists.txt	2012-05-20 22:40:25 +0000
@@ -140,6 +140,7 @@
                  test_favorite_store_gsettings.cpp
                  test_favorite_store_private.cpp
                  test_home_lens.cpp
+                 test_hud_text.cpp
                  test_launcher_entry_remote.cpp
                  test_shortcut_model.cpp
                  test_shortcut_private.cpp

=== added file 'tests/test_hud_text.cpp'
--- tests/test_hud_text.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_hud_text.cpp	2012-05-20 22:40:25 +0000
@@ -0,0 +1,28 @@
+#include <gmock/gmock.h>
+
+#include <UnityCore/Hud.h>
+
+using namespace testing;
+
+using unity::hud::reformat_hud_text;
+
+namespace
+{
+
+TEST(TestHudText, TestFoo)
+{
+  std::string colour("blue");
+
+  ASSERT_THAT(reformat_hud_text("test", colour),
+              Eq("<span color=\"blue\">test</span>"));
+  ASSERT_THAT(reformat_hud_text("<b>test</b>", colour),
+              Eq("test"));
+  ASSERT_THAT(reformat_hud_text("<b>te</b>st", colour),
+              Eq("te<span color=\"blue\">st</span>"));
+  ASSERT_THAT(reformat_hud_text("te<b>st</b>", colour),
+              Eq("<span color=\"blue\">te</span>st"));
+  ASSERT_THAT(reformat_hud_text("<b>te</b><b>st</b>", colour),
+              Eq("test"));
+}
+
+}