Merge lp:~3v1n0/unity/lockscreen-num-lock-warning into lp:unity

[Marco Trevisan (Treviño)]

TextInput: show warning also when num lock is enabled

[lp:~3v1n0/unity/lockscreen-num-lock-warning]

4029. By Marco Trevisan (Treviño) on 2015-11-06

UserPromptView: use show_lock_warnings

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4028
http://jenkins.qa.ubuntu.com/job/unity-ci/1343/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/119
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/118/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4029
http://jenkins.qa.ubuntu.com/job/unity-ci/1344/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/120
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/119/console

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

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

OnLockStateChanged and CheckLocks are poorly named IMHO. CheckLockWarnings?

[Andrea Azzarone (azzar1)]

Nevermind my fault, they look good.

[Andrea Azzarone (azzar1)]

+1

review: Approve

[Johan Boule (johan-boule)]

Some people see this new feature as a bug :|
See bug #1526322

=== modified file 'lockscreen/UserPromptView.cpp'
--- lockscreen/UserPromptView.cpp	2015-09-08 02:19:56 +0000
+++ lockscreen/UserPromptView.cpp	2015-11-06 13:51:19 +0000
@@ -317,7 +317,7 @@
   text_input->scale = scale();
   text_input->input_hint = SanitizeMessage(message);
   text_input->hint_font_size = PROMPT_FONT_SIZE;
-  text_input->show_caps_lock = true;
+  text_input->show_lock_warnings = true;
   text_input->show_activator = true;
   text_entry->SetPasswordMode(!visible);
   text_entry->SetPasswordChar("•");
 
=== modified file 'unity-shared/TextInput.cpp'
--- unity-shared/TextInput.cpp	2014-09-04 22:11:03 +0000
+++ unity-shared/TextInput.cpp	2015-11-06 13:51:19 +0000
@@ -92,10 +92,11 @@
   , hint_font_name(HINT_LABEL_DEFAULT_FONT_NAME)
   , hint_font_size(HINT_LABEL_FONT_SIZE)
   , show_activator(false)
-  , show_caps_lock(false)
+  , show_lock_warnings(false)
   , scale(1.0)
   , bg_layer_(new nux::ColorLayer(nux::Color(0xff595853), true))
   , caps_lock_on(false)
+  , num_lock_on(false)
   , last_width_(-1)
   , last_height_(-1)
 {
@@ -135,18 +136,12 @@
 
   // Caps lock warning
   warning_ = new IconTexture(LoadWarningIcon(DEFAULT_ICON_SIZE.CP(scale)));
-  warning_->SetVisible(caps_lock_on());
+  warning_->SetVisible(caps_lock_on() || num_lock_on());
   layout_->AddView(warning_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
-  caps_lock_on.changed.connect([this] (bool on) {
-    if (show_caps_lock)
-    {
-      warning_->SetVisible(on);
-      QueueRelayout();
-      QueueDraw();
-    }
-  });
+  num_lock_on.changed.connect(sigc::mem_fun(this, &TextInput::OnLockStateChanged));
+  caps_lock_on.changed.connect(sigc::mem_fun(this, &TextInput::OnLockStateChanged));
 
-  show_caps_lock.changed.connect(sigc::hide(sigc::mem_fun(this, &TextInput::CheckIfCapsLockOn)));
+  show_lock_warnings.changed.connect(sigc::hide(sigc::mem_fun(this, &TextInput::CheckLocks)));
   scale.changed.connect(sigc::mem_fun(this, &TextInput::UpdateScale));
   Settings::Instance().font_scaling.changed.connect(sigc::hide(sigc::mem_fun(this, &TextInput::UpdateSize)));
 
@@ -169,16 +164,9 @@
   spinner_->scale = scale();
   layout_->AddView(spinner_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
+  OnFontChanged();
   sig_manager_.Add<void, GtkSettings*>(gtk_settings_get_default(), "notify::gtk-font-name", sigc::hide(sigc::mem_fun(this, &TextInput::OnFontChanged)));
-  OnFontChanged();
-
-  sig_manager_.Add<void, GdkKeymap*>(gdk_keymap_get_default(), "state-changed", [this](GdkKeymap*) {
-    CheckIfCapsLockOn();
-  });
-
-  sig_manager_.Add<void, GdkKeymap*>(gdk_keymap_get_default(), "state-changed", [this](GdkKeymap*) {
-    CheckIfCapsLockOn();
-  });
+  sig_manager_.Add<void, GdkKeymap*>(gdk_keymap_get_default(), "state-changed", [this](GdkKeymap*) { CheckLocks(); });
 
   input_string.SetGetterFunction(sigc::mem_fun(this, &TextInput::get_input_string));
   input_string.SetSetterFunction(sigc::mem_fun(this, &TextInput::set_input_string));
@@ -228,10 +216,25 @@
   QueueDraw();
 }
 
-void TextInput::CheckIfCapsLockOn()
+void TextInput::CheckLocks()
 {
   GdkKeymap* keymap = gdk_keymap_get_default();
-  caps_lock_on = gdk_keymap_get_caps_lock_state(keymap) == FALSE ? false : true;
+  caps_lock_on = gdk_keymap_get_caps_lock_state(keymap) ? true : false;
+  num_lock_on = gdk_keymap_get_num_lock_state(keymap) ? true : false;
+}
+
+void TextInput::OnLockStateChanged(bool)
+{
+  if (!show_lock_warnings)
+  {
+    warning_->SetVisible(false);
+    return;
+  }
+
+  warning_->SetVisible(caps_lock_on() || num_lock_on());
+  warning_tooltip_.Release();
+  QueueRelayout();
+  QueueDraw();
 }
 
 void TextInput::SetSpinnerVisible(bool visible)
@@ -308,7 +311,19 @@
   pango_cairo_context_set_resolution(context, 96.0 * Settings::Instance().font_scaling());
 
   pango_layout_set_height(layout, -1); //avoid wrap lines
-  pango_layout_set_text(layout, _("Caps lock is on"), -1);
+
+  if (caps_lock_on() && num_lock_on())
+  {
+    pango_layout_set_text(layout, _("Caps lock and Num lock are on"), -1);
+  }
+  else if (caps_lock_on())
+  {
+    pango_layout_set_text(layout, _("Caps lock is on"), -1);
+  }
+  else if (num_lock_on())
+  {
+    pango_layout_set_text(layout, _("Num lock is on"), -1);
+  }
 
   nux::Size extents;
   pango_layout_get_pixel_size(layout, &extents.width, &extents.height);
@@ -395,7 +410,7 @@
 
   layout_->ProcessDraw(GfxContext, force_draw);
 
-  if (caps_lock_on && warning_->IsMouseInside() && !tooltip_timeout_)
+  if (warning_->IsVisible() && warning_->IsMouseInside() && !tooltip_timeout_)
     PaintWarningTooltip(GfxContext);
 
   if (!IsFullRedraw())
 
=== modified file 'unity-shared/TextInput.h'
--- unity-shared/TextInput.h	2014-08-27 22:08:58 +0000
+++ unity-shared/TextInput.h	2015-11-06 13:51:19 +0000
@@ -64,7 +64,7 @@
   nux::ROProperty<bool> im_active;
   nux::ROProperty<bool> im_preedit;
   nux::Property<bool> show_activator;
-  nux::Property<bool> show_caps_lock;
+  nux::Property<bool> show_lock_warnings;
   nux::Property<double> scale;
 
 private:
@@ -77,14 +77,12 @@
   void UpdateSize();
 
   std::string GetName() const;
-
   void AddProperties(debug::IntrospectionData&);
+
   bool AcceptKeyNavFocus();
-
   bool ShouldBeHighlighted();
-
-  nux::Geometry GetWaringIconGeometry() const;
-  void CheckIfCapsLockOn();
+  void CheckLocks();
+  void OnLockStateChanged(bool);
 
   nux::ObjectPtr<nux::BaseTexture> LoadActivatorIcon(int icon_size);
   nux::ObjectPtr<nux::BaseTexture> LoadWarningIcon(int icon_size);
@@ -117,6 +115,7 @@
   SearchBarSpinner* spinner_;
 
   nux::Property<bool> caps_lock_on;
+  nux::Property<bool> num_lock_on;
   int last_width_;
   int last_height_;