Merge lp:~gordallott/nux/completion into lp:nux/2.0

[Gord Allott]

Adds very basic completion support to nux,
Essentially just adds text to the end of the TextEntry widget without any real logic as the logic we want for unity is
different from what we want for a toolkit

Basically just a visual change to allow hud to offer completion

[Tim Penhey (thumper)]

Looks good.

review: Approve

=== modified file 'Nux/TextEntry.cpp'
--- Nux/TextEntry.cpp	2012-01-10 10:31:22 +0000
+++ Nux/TextEntry.cpp	2012-02-06 13:36:36 +0000
@@ -116,6 +116,7 @@
     , canvas_(nullptr)
     , cached_layout_(nullptr)
     , preedit_attrs_(nullptr)
+    , completion_color_(color::Gray)
     , last_dblclick_time_(0)
     , cursor_(0)
     , preedit_cursor_(0)
@@ -576,6 +577,34 @@
     return text_;
   }
 
+  void TextEntry::SetCompletion(const char *text)
+  {
+    const char *end = NULL;
+    g_utf8_validate(text, -1, &end);
+    std::string txt((text && *text && end > text) ? std::string(text, end) : "");
+    if (txt == completion_)
+      return;
+
+    completion_ = txt;
+    QueueRefresh(true, true);
+  }
+
+  std::string const& TextEntry::GetCompletion() const
+  {
+    return completion_;
+  }
+
+  void TextEntry::SetCompletionColor(const Color &color)
+  {
+    completion_color_ = color;
+    QueueRefresh(true, true);
+  }
+
+  Color const& TextEntry::GetCompletionColor() const
+  {
+    return completion_color_;
+  }
+
   void TextEntry::SetTextColor(const Color &text_color)
   {
     if (_text_color != text_color)
@@ -1163,6 +1192,13 @@
       }
     }
 
+    int pre_completion_length = tmp_string.length();
+
+    if (!completion_.empty() && !wrap_)
+    {
+      tmp_string = text_ + completion_;
+    }
+
     pango_layout_set_text(layout, tmp_string.c_str(),
                           static_cast<int>(tmp_string.length()));
 
@@ -1172,13 +1208,22 @@
     {
       attr = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
       attr->start_index = 0;
-      attr->end_index = static_cast<guint>(tmp_string.length());
+      attr->end_index = static_cast<guint>(pre_completion_length);
       pango_attr_list_insert(tmp_attrs, attr);
     }
     if (strikeout_)
     {
       attr = pango_attr_strikethrough_new(TRUE);
       attr->start_index = 0;
+      attr->end_index = static_cast<guint>(pre_completion_length);
+      pango_attr_list_insert(tmp_attrs, attr);
+    }
+    if (!completion_.empty() && !wrap_)
+    {
+      attr = pango_attr_foreground_new(65535 * completion_color_.red, 
+                                       65535 * completion_color_.green,
+                                       65535 * completion_color_.blue);
+      attr->start_index = static_cast<guint>(pre_completion_length);
       attr->end_index = static_cast<guint>(tmp_string.length());
       pango_attr_list_insert(tmp_attrs, attr);
     }

=== modified file 'Nux/TextEntry.h'
--- Nux/TextEntry.h	2012-01-10 10:27:09 +0000
+++ Nux/TextEntry.h	2012-02-06 13:36:36 +0000
@@ -132,6 +132,12 @@
     void SetText(const char *text);
     std::string const& GetText() const;
 
+    void SetCompletion(const char *text); // Should use std::string, does not for consistancy
+    std::string const& GetCompletion() const;
+
+    void SetCompletionColor(const Color &color);
+    Color const& GetCompletionColor() const;
+
     void SetTextColor(const Color &color);
     Color const& GetTextColor() const;
     void SetFontFamily(const char *font);
@@ -294,6 +300,12 @@
      */
     std::string password_char_;
 
+    /** The completion string */
+    std::string completion_;
+
+    /** The completion colour */
+    Color completion_color_;
+
     /** Last time of mouse double click event. */
     unsigned long long last_dblclick_time_;
 

=== modified file 'examples/text_entry_focus.cpp'
--- examples/text_entry_focus.cpp	2011-10-12 04:42:24 +0000
+++ examples/text_entry_focus.cpp	2012-02-06 13:36:36 +0000
@@ -36,6 +36,7 @@
 
     text_entry_0->SetMaximumWidth(300);
     text_entry_0->SetMinimumHeight (20);
+    text_entry_0->SetCompletion("test completion");
 
     text_entry_1->SetMaximumWidth(300);
     text_entry_1->SetMinimumHeight (20);