Merge lp:~3v1n0/nux/textentry-toggle-cursor-visibility into lp:nux

[Marco Trevisan (Treviño)]

TextEntry: add setter/getter to make the cursor visible only on key focus

When the toggle is false, the text entry cursor is shown only if the area
is key-focused.

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'Nux/TextEntry.cpp'
--- Nux/TextEntry.cpp	2013-12-18 21:43:30 +0000
+++ Nux/TextEntry.cpp	2014-03-05 16:14:40 +0000
@@ -179,6 +179,7 @@
     , key_nav_mode_(false)
     , lose_key_focus_on_key_nav_direction_up_(true)
     , lose_key_focus_on_key_nav_direction_down_(true)
+    , cursor_visible_on_key_focus_only_(false)
   {
     cairo_font_options_set_antialias(font_options_, CAIRO_ANTIALIAS_SUBPIXEL);
     cairo_font_options_set_hint_style(font_options_, CAIRO_HINT_STYLE_FULL);
@@ -914,6 +915,13 @@
       cursor_visible_ = false; // hide cursor when losing focus
       selection_changed_ = true;
       cursor_moved_ = true;
+
+      if (cursor_visible_on_key_focus_only_ && cursor_blink_timer_)
+      {
+        g_source_remove(cursor_blink_timer_);
+        cursor_blink_timer_ = 0;
+      }
+
       // Don't adjust scroll.
       QueueRefresh(true, false);
     }
@@ -1144,6 +1152,9 @@
 
   void TextEntry::QueueCursorBlink()
   {
+    if (cursor_visible_on_key_focus_only_ && !focused_)
+      return;
+
     if (!cursor_blink_timer_)
       cursor_blink_timer_ = g_timeout_add(kCursorBlinkTimeout,
                                           (GSourceFunc)&CursorBlinkCallback,
@@ -2517,6 +2528,41 @@
     return lose_key_focus_on_key_nav_direction_down_;
   }
 
+  void TextEntry::SetToggleCursorVisibilityOnKeyFocus(bool b)
+  {
+    if (cursor_visible_on_key_focus_only_ == b)
+      return;
+
+    cursor_visible_on_key_focus_only_ = b;
+
+    if (cursor_visible_on_key_focus_only_)
+    {
+      if (!focused_)
+      {
+        if (cursor_blink_timer_)
+        {
+          g_source_remove(cursor_blink_timer_);
+          cursor_blink_timer_ = 0;
+        }
+
+        cursor_visible_ = false;
+        QueueDraw();
+      }
+    }
+    else
+    {
+      if (!focused_)
+      {
+        QueueCursorBlink();
+      }
+    }
+  }
+
+  bool TextEntry::GetToggleCursorVisibilityOnKeyFocus() const
+  {
+    return cursor_visible_on_key_focus_only_;
+  }
+
   bool TextEntry::IsInTextInputMode() const
   {
     return text_input_mode_;

=== modified file 'Nux/TextEntry.h'
--- Nux/TextEntry.h	2013-12-18 21:43:30 +0000
+++ Nux/TextEntry.h	2014-03-05 16:14:40 +0000
@@ -173,6 +173,8 @@
     void MoveCursorToLineStart();
     void MoveCursorToLineEnd();
 
+    void SetToggleCursorVisibilityOnKeyFocus(bool b);
+    bool GetToggleCursorVisibilityOnKeyFocus() const;
 
     /*!
         When the text entry is in single line mode, the keyboard arrow up/down may be used
@@ -511,6 +513,7 @@
 
     bool lose_key_focus_on_key_nav_direction_up_;
     bool lose_key_focus_on_key_nav_direction_down_;
+    bool cursor_visible_on_key_focus_only_;
 
     std::vector<unsigned long> composition_list_;