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

[Andrea Azzarone]

Add an arrow activator in the lockscreen.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3833
http://jenkins.qa.ubuntu.com/job/unity-ci/984/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/71

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/984/rebuild

review: Approve (continuous-integration)

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

Cool, looks and works fine. The only thing is that probably the resource name should be better and it would be nice to ask tiheum an SVG version, so that we can eventually scale the lockscreen properly.

But this is fine from a general point of view.

review: Approve

=== modified file 'lockscreen/UserPromptView.cpp'
--- lockscreen/UserPromptView.cpp	2014-06-07 16:26:51 +0000
+++ lockscreen/UserPromptView.cpp	2014-06-20 12:25:33 +0000
@@ -242,6 +242,7 @@
   text_input->input_hint = SanitizeMessage(message);
   text_input->hint_font_size = PROMPT_FONT_SIZE;
   text_input->show_caps_lock = true;
+  text_input->show_activator = true;
   text_entry->SetPasswordMode(!visible);
   text_entry->SetPasswordChar("•");
   text_entry->SetToggleCursorVisibilityOnKeyFocus(true);

=== added file 'resources/arrow_right.png'
Binary files resources/arrow_right.png	1970-01-01 00:00:00 +0000 and resources/arrow_right.png	2014-06-20 12:25:33 +0000 differ
=== modified file 'unity-shared/TextInput.cpp'
--- unity-shared/TextInput.cpp	2014-04-23 16:49:25 +0000
+++ unity-shared/TextInput.cpp	2014-06-20 12:25:33 +0000
@@ -22,6 +22,7 @@
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/RawPixel.h"
 #include "unity-shared/PreviewStyle.h"
+#include "unity-shared/TextureCache.h"
 
 #include <X11/XKBlib.h>
 
@@ -87,6 +88,7 @@
   , input_hint("")
   , hint_font_name(HINT_LABEL_DEFAULT_FONT_NAME)
   , hint_font_size(HINT_LABEL_FONT_SIZE)
+  , show_activator(false)
   , show_caps_lock(false)
   , bg_layer_(new nux::ColorLayer(nux::Color(0xff595853), true))
   , caps_lock_on(false)
@@ -127,6 +129,7 @@
   layered_layout_->SetActiveLayerN(1);
   layout_->AddView(layered_layout_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
 
+  // Caps lock warning
   warning_ = new IconTexture(LoadWarningIcon(DEFAULT_ICON_SIZE));
   warning_->SetVisible(caps_lock_on());
   layout_->AddView(warning_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
@@ -146,6 +149,20 @@
     CheckIfCapsLockOn();
   });
 
+  // Activator
+  activator_ = new IconTexture(LoadActivatorIcon(DEFAULT_ICON_SIZE));
+  activator_->SetVisible(show_activator());
+  layout_->AddView(activator_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+
+  show_activator.changed.connect([this] (bool value) {
+    activator_->SetVisible(value);
+  });
+
+  activator_->mouse_click.connect([this](int, int, unsigned long, unsigned long) {
+    pango_entry_->activated.emit();
+  });
+
+  // Spinner
   spinner_ = new SearchBarSpinner();
   spinner_->SetVisible(false);
   spinner_->SetMinMaxSize(22, 22);
@@ -187,6 +204,11 @@
 void TextInput::SetSpinnerVisible(bool visible)
 {
   spinner_->SetVisible(visible);
+
+  if (visible)
+    activator_->SetVisible(false);
+  else
+    activator_->SetVisible(show_activator());
 }
 
 void TextInput::SetSpinnerState(SpinnerState spinner_state)
@@ -199,6 +221,12 @@
   hint_->SetFont((hint_font_name() + " " + std::to_string(hint_font_size())).c_str());
 }
 
+nux::ObjectPtr<nux::BaseTexture> TextInput::LoadActivatorIcon(int icon_size)
+{
+  TextureCache& cache = TextureCache::GetDefault();
+  return cache.FindTexture("arrow_right.png", icon_size, icon_size);
+}
+
 nux::ObjectPtr<nux::BaseTexture> TextInput::LoadWarningIcon(int icon_size)
 {
   auto* theme = gtk_icon_theme_get_default();

=== modified file 'unity-shared/TextInput.h'
--- unity-shared/TextInput.h	2014-04-23 16:49:25 +0000
+++ unity-shared/TextInput.h	2014-06-20 12:25:33 +0000
@@ -72,6 +72,7 @@
   nux::Property<int> hint_font_size;
   nux::ROProperty<bool> im_active;
   nux::ROProperty<bool> im_preedit;
+  nux::Property<bool> show_activator;
   nux::Property<bool> show_caps_lock;
 
 private:
@@ -91,6 +92,7 @@
   nux::Geometry GetWaringIconGeometry() const;
   void CheckIfCapsLockOn();
 
+  nux::ObjectPtr<nux::BaseTexture> LoadActivatorIcon(int icon_size);
   nux::ObjectPtr<nux::BaseTexture> LoadWarningIcon(int icon_size);
   void LoadWarningTooltip();
 
@@ -126,6 +128,7 @@
   bool mouse_over_warning_icon_;
 
   IconTexture* warning_;
+  IconTexture* activator_;
   nux::ObjectPtr<nux::BaseTexture> warning_tooltip_;
 
   glib::SignalManager sig_manager_;