Merge lp:~brandontschaefer/unity/lp.1308288-fix into lp:unity

[Brandon Schaefer]

Lockscreen warning icon needs a tooltip to say what the warning is about!

Lockscreen warning icon needs a tooltip to say what the warning is about!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3787
http://jenkins.qa.ubuntu.com/job/unity-ci/875/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/411
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/407
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/409

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3788
http://jenkins.qa.ubuntu.com/job/unity-ci/877/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/413
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/409
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/411

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3791
http://jenkins.qa.ubuntu.com/job/unity-ci/893/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/429
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/425
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/427

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

review: Approve (continuous-integration)

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

Cool, this is fine, and Yes the tooltip should stay above the text, not inside the layout.

The only thing here is that, imho you should initialize both the warning icon and the tooltip only if show_caps_lock is set to true, otherwise we shouldn't spend any time on building them.

204 + IconTexture* warning_;
205 + nux::ObjectPtr<nux::BaseTexture> warning_tooltip_;

Also please move these above the sig_manager_, as that one should be the first one to be destroyed.
Plus, do we really need to keep track of IconTexture* warning_;? You can just always pass it to the lambdas...

[Brandon Schaefer (brandontschaefer)]

Yeah, unfortunately:
156 + nux::Geometry warning_geo = warning_->GetGeometry();

I need the warnings geo, which can change depending on if activated or not.

The problem about waiting to init both warning icon/tooltip is the icon it self needs to be placed in the layout before the spinner. If its not, then it'll get added on after the spinner (not sure if we can place it before?).

Im fine doing that with the tooltip though, on a show_caps_lock changed, if warning_tooltip_ == nullptr, then create it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3792
http://jenkins.qa.ubuntu.com/job/unity-ci/894/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/430
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/426
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/428

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

review: Approve (continuous-integration)

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

Ok, sounds fine.

review: Approve

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2014-04-02 12:31:33 +0000
+++ po/POTFILES.in	2014-04-23 16:50:25 +0000
@@ -48,5 +48,6 @@
 unity-shared/DashStyle.cpp
 unity-shared/PreviewStyle.cpp
 unity-shared/SearchBar.cpp
+unity-shared/TextInput.cpp
 unity-shared/UScreen.cpp
 gnome/50-unity-launchers.xml.in
 
=== modified file 'unity-shared/TextInput.cpp'
--- unity-shared/TextInput.cpp	2014-04-23 16:50:25 +0000
+++ unity-shared/TextInput.cpp	2014-04-23 16:50:25 +0000
@@ -38,10 +38,14 @@
 
 const int HIGHLIGHT_HEIGHT = 24;
 
+const RawPixel TOOLTIP_Y_OFFSET  =  3_em;
+const RawPixel TOOLTIP_OFFSET    = 10_em;
 const RawPixel DEFAULT_ICON_SIZE = 22_em;
 
-std::string WARNING_ICON = "dialog-warning-symbolic";
+// Caps is on 0x1, couldn't find any #define in /usr/include/X11
+const int CAPS_STATE_ON = 0x1;
 
+std::string WARNING_ICON    = "dialog-warning-symbolic";
 // Fonts
 const std::string HINT_LABEL_DEFAULT_FONT_NAME = "Ubuntu";
 const int HINT_LABEL_FONT_SIZE = 11;
@@ -88,6 +92,7 @@
   , caps_lock_on(false)
   , last_width_(-1)
   , last_height_(-1)
+  , mouse_over_warning_icon_(false)
 {
   layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
   layout_->SetLeftAndRightPadding(LEFT_INTERNAL_PADDING, TEXT_INPUT_RIGHT_BORDER);
@@ -122,19 +127,22 @@
   layered_layout_->SetActiveLayerN(1);
   layout_->AddView(layered_layout_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
 
-  auto* warning = new IconTexture(LoadWarningIcon(DEFAULT_ICON_SIZE));
-  warning->SetVisible(caps_lock_on());
-  layout_->AddView(warning, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
-  caps_lock_on.changed.connect([this, warning] (bool on) {
+  warning_ = new IconTexture(LoadWarningIcon(DEFAULT_ICON_SIZE));
+  warning_->SetVisible(caps_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);
+      warning_->SetVisible(on);
       QueueRelayout();
       QueueDraw();
     }
   });
 
   show_caps_lock.changed.connect([this] (bool changed) {
+    if (!warning_tooltip_.IsValid())
+      LoadWarningTooltip();
+
     CheckIfCapsLockOn();
   });
 
@@ -152,6 +160,16 @@
   im_active.SetGetterFunction(sigc::mem_fun(this, &TextInput::get_im_active));
   im_preedit.SetGetterFunction(sigc::mem_fun(this, &TextInput::get_im_preedit));
   input_hint.changed.connect([this](std::string const& s) { OnInputHintChanged(); });
+
+  warning_->mouse_enter.connect([this] (int x, int y, int button, int key_flags) {
+    mouse_over_warning_icon_ = true;
+    QueueDraw();
+  });
+
+  warning_->mouse_leave.connect([this] (int x, int y, int button, int key_flags) {
+    mouse_over_warning_icon_ = false;
+    QueueDraw();
+  });
 }
 
 void TextInput::CheckIfCapsLockOn()
@@ -160,8 +178,7 @@
   unsigned int state = 0;
   XkbGetIndicatorState(dpy, XkbUseCoreKbd, &state);
 
-  // Caps is on 0x1, couldn't find any #define in /usr/include/X11
-  if ((state & 0x1) == 1)
+  if ((state & CAPS_STATE_ON) == 1)
     caps_lock_on = true;
   else
     caps_lock_on = false;
@@ -213,6 +230,44 @@
   }
 }
 
+void TextInput::LoadWarningTooltip()
+{
+  glib::String font_name;
+  g_object_get(gtk_settings_get_default(), "gtk-font-name", &font_name, NULL);
+
+  glib::Object<GtkStyleContext> style_context(gtk_style_context_new());
+  std::shared_ptr<GtkWidgetPath> widget_path(gtk_widget_path_new(), gtk_widget_path_free);
+  gtk_widget_path_append_type(widget_path.get(), GTK_TYPE_TOOLTIP);
+
+  gtk_style_context_set_path(style_context, widget_path.get());
+  gtk_style_context_add_class(style_context, "tooltip");
+
+  glib::Object<PangoLayout> layout;
+  glib::Object<PangoContext> context(gdk_pango_context_get_for_screen(gdk_screen_get_default()));
+  layout = pango_layout_new(context);
+
+  std::shared_ptr<PangoFontDescription> desc(pango_font_description_from_string(font_name), pango_font_description_free);
+  pango_context_set_font_description(context, desc.get());
+  pango_context_set_language(context, gtk_get_default_language());
+
+  pango_layout_set_height(layout, -1); //avoid wrap lines
+  pango_layout_set_text(layout, _("Caps lock is on"), -1);
+
+  nux::Size extents;
+  pango_layout_get_pixel_size(layout, &extents.width, &extents.height);
+  extents.width  += TOOLTIP_OFFSET;
+  extents.height += TOOLTIP_OFFSET;
+
+  nux::CairoGraphics cg(CAIRO_FORMAT_ARGB32, extents.width, extents.height);
+  cairo_t* cr = cg.GetInternalContext();
+
+  gtk_render_background(style_context, cr, 0, 0, extents.width, extents.height);
+  gtk_render_frame(style_context, cr, 0, 0, extents.width, extents.height);
+  gtk_render_layout(style_context, cr, TOOLTIP_OFFSET/2, TOOLTIP_OFFSET/2, layout);
+
+  warning_tooltip_ = texture_ptr_from_cairo_graphics(cg);
+}
+
 void TextInput::OnFontChanged(GtkSettings* settings, GParamSpec* pspec)
 {
   glib::String font_name;
@@ -270,7 +325,6 @@
     nux::GetPainter().PushLayer(GfxContext, highlight_layer_->GetGeometry(), highlight_layer_.get());
   }
 
-
   if (!IsFullRedraw())
   {
     gPainter.PushLayer(GfxContext, bg_layer_->GetGeometry(), bg_layer_.get());
@@ -282,6 +336,9 @@
 
   layout_->ProcessDraw(GfxContext, force_draw);
 
+  if (caps_lock_on && mouse_over_warning_icon_)
+      PaintWarningTooltip(GfxContext);
+
   if (!IsFullRedraw())
   {
     gPainter.PopBackground();
@@ -294,6 +351,18 @@
   GfxContext.PopClippingRectangle();
 }
 
+void TextInput::PaintWarningTooltip(nux::GraphicsEngine& graphics_engine)
+{
+  nux::Geometry warning_geo = warning_->GetGeometry();
+
+  nux::Geometry tooltip_geo = {warning_geo.x - (warning_tooltip_->GetWidth() + TOOLTIP_OFFSET / 2),
+                               warning_geo.y - TOOLTIP_Y_OFFSET,
+                               warning_tooltip_->GetWidth(),
+                               warning_tooltip_->GetHeight()};
+
+  nux::GetPainter().PushDrawLayer(graphics_engine, tooltip_geo, CreateWarningLayer(warning_tooltip_.GetPointer()));
+}
+
 void TextInput::UpdateBackground(bool force)
 {
   int RADIUS = 5;
 
=== modified file 'unity-shared/TextInput.h'
--- unity-shared/TextInput.h	2014-04-23 16:50:25 +0000
+++ unity-shared/TextInput.h	2014-04-23 16:50:25 +0000
@@ -87,9 +87,14 @@
   bool AcceptKeyNavFocus();
 
   bool ShouldBeHighlighted();
+
+  nux::Geometry GetWaringIconGeometry() const;
   void CheckIfCapsLockOn();
 
   nux::ObjectPtr<nux::BaseTexture> LoadWarningIcon(int icon_size);
+  void LoadWarningTooltip();
+
+  void PaintWarningTooltip(nux::GraphicsEngine& graphics_engine);
 
 protected:
   void OnInputHintChanged();
@@ -109,7 +114,6 @@
   IMTextEntry* pango_entry_;
 
 private:
-
   std::unique_ptr<nux::AbstractPaintLayer> bg_layer_;
   std::unique_ptr<nux::AbstractPaintLayer> highlight_layer_;
   nux::HLayout* layout_;
@@ -119,6 +123,10 @@
   nux::Property<bool> caps_lock_on;
   int last_width_;
   int last_height_;
+  bool mouse_over_warning_icon_;
+
+  IconTexture* warning_;
+  nux::ObjectPtr<nux::BaseTexture> warning_tooltip_;
 
   glib::SignalManager sig_manager_;
 };