Merge lp:~unity-team/unity/trusty-1332509 into lp:unity/7.2

[Stephen M. Webb]

add an arrow activator in the lockscreen

Adds an arrow activator in the lockscreen (lp: #1332509).

This change is cherry-picked from trunk for SRUing into Ubuntu 14.04 LTS.

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-26 13:49:00 +0000
+++ debian/changelog	2014-12-09 13:24:56 +0000
@@ -1,3 +1,9 @@
+unity (7.2.3+14.04.20140826-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Add an arrow activator in the lockscreen. (lp: #1332509)
+
+ -- Andrea Azzarone <[e-mail]>  Tue, 09 Dec 2014 08:19:40 -0500
+
 unity (7.2.3+14.04.20140826-0ubuntu1) trusty; urgency=medium
 
   [ Andrea Azzarone ]

=== modified file 'lockscreen/UserPromptView.cpp'
--- lockscreen/UserPromptView.cpp	2014-07-24 14:03:10 +0000
+++ lockscreen/UserPromptView.cpp	2014-12-09 13:24:56 +0000
@@ -241,6 +241,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-12-09 13:24:56 +0000 differ
=== modified file 'unity-shared/TextInput.cpp'
--- unity-shared/TextInput.cpp	2014-08-06 14:15:32 +0000
+++ unity-shared/TextInput.cpp	2014-12-09 13:24:56 +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"
 
 namespace unity
 {
@@ -82,6 +83,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)
@@ -121,6 +123,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);
@@ -140,6 +143,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);
@@ -179,6 +196,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)
@@ -191,6 +213,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-08-06 14:15:32 +0000
+++ unity-shared/TextInput.h	2014-12-09 13:24:56 +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();
 
@@ -125,6 +127,7 @@
   bool mouse_over_warning_icon_;
 
   IconTexture* warning_;
+  IconTexture* activator_;
   nux::ObjectPtr<nux::BaseTexture> warning_tooltip_;
 
   glib::SignalManager sig_manager_;