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

[Stephen M. Webb]

resolved some lockscreen issues

Resolve some lock screen issues for SRUing into Ubuntu 14.04 LTS.

(1) lockscreen scaling fixes (lp: #1292218)

(2) use a single PAM session for all screens (lp: #1308540)

These two fixes were cherry-picked from trunk (and are closely linked in the code, so submitted as a single MP for SRU).

Unmerged revisions

=== modified file 'dash/previews/ErrorPreview.cpp'
--- dash/previews/ErrorPreview.cpp	2014-08-06 14:09:30 +0000
+++ dash/previews/ErrorPreview.cpp	2014-12-08 22:21:12 +0000
@@ -37,6 +37,7 @@
 
 #include "stdio.h"
 #include "config.h"
+#include <glib/gi18n-lib.h>
 
 namespace unity
 {

=== modified file 'dash/previews/PaymentPreview.cpp'
--- dash/previews/PaymentPreview.cpp	2014-07-24 14:14:47 +0000
+++ dash/previews/PaymentPreview.cpp	2014-12-08 22:21:12 +0000
@@ -20,8 +20,10 @@
  *              Manuel de la Pena <[e-mail]>
  *
  */
+#include "PaymentPreview.h"
+
+#include <Nux/VLayout.h>
 #include <NuxCore/Logger.h>
-#include "PaymentPreview.h"
 #include "unity-shared/CoverArt.h"
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/PreviewStyle.h"

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-26 13:49:00 +0000
+++ debian/changelog	2014-12-08 22:21:12 +0000
@@ -1,3 +1,14 @@
+unity (7.2.3+14.04.20140826-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Andrea Azzarone ]
+  * Share lockscreen password between screens (lp: #1308540)
+
+  [ Marco Trevisan (Treviño) ]
+  * Lockscreen: scale the UI elements based on current monitor scaling
+    (lp: #1292218)
+
+ -- Andrea Azzarone <[e-mail]>  Mon, 08 Dec 2014 16:55:31 -0500
+
 unity (7.2.3+14.04.20140826-0ubuntu1) trusty; urgency=medium
 
   [ Andrea Azzarone ]

=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2014-08-06 14:19:10 +0000
+++ launcher/SwitcherView.cpp	2014-12-08 22:21:12 +0000
@@ -78,7 +78,7 @@
   icon_renderer_->SetTargetSize(tile_size, icon_size, minimum_spacing);
 
   text_view_->SetMaximumWidth(tile_size * TEXT_TILE_MULTIPLIER);
-  text_view_->SetLines(1);
+  text_view_->SetLines(-1);
   text_view_->SetTextColor(nux::color::White);
   text_view_->SetFont("Ubuntu Bold 10");
   text_view_->SetScale(scale);

=== modified file 'lockscreen/BackgroundSettings.cpp'
--- lockscreen/BackgroundSettings.cpp	2014-04-10 01:16:32 +0000
+++ lockscreen/BackgroundSettings.cpp	2014-12-08 22:21:12 +0000
@@ -25,6 +25,7 @@
 #include "LockScreenSettings.h"
 #include "unity-shared/CairoTexture.h"
 #include "unity-shared/PanelStyle.h"
+#include "unity-shared/UnitySettings.h"
 #include "unity-shared/UScreen.h"
 
 namespace unity
@@ -35,7 +36,7 @@
 {
 const std::string SETTINGS_NAME = "org.gnome.desktop.background";
 
-constexpr int GetGridOffset(int size) { return (size % Settings::GRID_SIZE) / 2; }
+inline int GetGridOffset(int size) { return (size % Settings::GRID_SIZE) / 2; }
 }
 
 BackgroundSettings::BackgroundSettings()
@@ -45,26 +46,27 @@
   gnome_bg_load_from_preferences(gnome_bg_, settings);
 }
 
-BackgroundSettings::~BackgroundSettings()
-{}
-
 BaseTexturePtr BackgroundSettings::GetBackgroundTexture(int monitor)
 {
   nux::Geometry const& geo = UScreen::GetDefault()->GetMonitorGeometry(monitor);
+  double scale = unity::Settings::Instance().em(monitor)->DPIScale();
   auto& settings = Settings::Instance();
 
   nux::CairoGraphics cairo_graphics(CAIRO_FORMAT_ARGB32, geo.width, geo.height);
+  cairo_surface_set_device_scale(cairo_graphics.GetSurface(), scale, scale);
   cairo_t* c = cairo_graphics.GetInternalContext();
 
+  double s_width = geo.width / scale;
+  double s_height = geo.height / scale;
   cairo_surface_t* bg_surface = nullptr;
 
   if (settings.use_user_background())
   {
-    bg_surface = gnome_bg_create_surface(gnome_bg_, gdk_get_default_root_window(), geo.width, geo.height, FALSE);
+    bg_surface = gnome_bg_create_surface(gnome_bg_, gdk_get_default_root_window(), s_width, s_height, FALSE);
   }
   else if (!settings.background().empty())
   {
-    glib::Object<GdkPixbuf> pixbuf(gdk_pixbuf_new_from_file_at_scale(settings.background().c_str(), geo.width, geo.height, FALSE, NULL));
+    glib::Object<GdkPixbuf> pixbuf(gdk_pixbuf_new_from_file_at_scale(settings.background().c_str(), s_width, s_height, FALSE, NULL));
 
     if (pixbuf)
       bg_surface = gdk_cairo_surface_create_from_pixbuf(pixbuf, 0, NULL);
@@ -85,15 +87,15 @@
 
   if (!settings.logo().empty())
   {
-    int grid_x_offset = GetGridOffset(geo.width);
-    int grid_y_offset = GetGridOffset(geo.height);
+    int grid_x_offset = GetGridOffset(s_width);
+    int grid_y_offset = GetGridOffset(s_height);
     cairo_surface_t* logo_surface = cairo_image_surface_create_from_png(settings.logo().c_str());
 
     if (logo_surface)
     {
       int height = cairo_image_surface_get_height(logo_surface);
       int x = grid_x_offset;
-      int y = grid_y_offset + Settings::GRID_SIZE * (geo.height / Settings::GRID_SIZE - 1) - height;
+      int y = grid_y_offset + Settings::GRID_SIZE * (s_height / Settings::GRID_SIZE - 1) - height;
 
       cairo_save(c);
       cairo_translate(c, x, y);
@@ -107,8 +109,8 @@
 
   if (settings.draw_grid())
   {
-    int width = geo.width;
-    int height = geo.height;
+    double width = s_width;
+    double height = s_height;
     int grid_x_offset = GetGridOffset(width);
     int grid_y_offset = GetGridOffset(height) + panel::Style::Instance().PanelHeight(monitor);
 

=== modified file 'lockscreen/BackgroundSettings.h'
--- lockscreen/BackgroundSettings.h	2014-03-06 03:55:03 +0000
+++ lockscreen/BackgroundSettings.h	2014-12-08 22:21:12 +0000
@@ -41,7 +41,6 @@
 {
 public:
   BackgroundSettings();
-  ~BackgroundSettings();
 
   BaseTexturePtr GetBackgroundTexture(int monitor);
 

=== modified file 'lockscreen/CofView.cpp'
--- lockscreen/CofView.cpp	2014-02-13 13:57:57 +0000
+++ lockscreen/CofView.cpp	2014-12-08 22:21:12 +0000
@@ -18,6 +18,7 @@
 */
 
 #include "CofView.h"
+#include "unity-shared/RawPixel.h"
 
 #include "config.h"
 
@@ -25,11 +26,23 @@
 {
 namespace lockscreen
 {
+namespace
+{
+const std::string COF_FILE = "cof.png";
+}
 
 CofView::CofView()
   // FIXME (andy) if we get an svg cof we can make it fullscreen independent.
-  : IconTexture(PKGDATADIR"/cof.png", 66)
-{}
+  : IconTexture(PKGDATADIR"/"+COF_FILE, -1)
+  , scale(1.0)
+{
+  scale.changed.connect([this] (double scale) {
+    int w, h;
+    gdk_pixbuf_get_file_info((PKGDATADIR"/" + COF_FILE).c_str(), &w, &h);
+    SetSize(RawPixel(std::max(w, h)).CP(scale));
+    ReLoadIcon();
+  });
+}
 
 nux::Area* CofView::FindAreaUnderMouse(nux::Point const& mouse_position,
                                        nux::NuxEventType event_type)

=== modified file 'lockscreen/CofView.h'
--- lockscreen/CofView.h	2014-02-13 13:57:57 +0000
+++ lockscreen/CofView.h	2014-12-08 22:21:12 +0000
@@ -27,11 +27,13 @@
 namespace lockscreen
 {
 
-class CofView : public unity::IconTexture
+class CofView : public IconTexture
 {
 public:
   CofView();
 
+  nux::Property<double> scale;
+
   nux::Area* FindAreaUnderMouse(nux::Point const& mouse_position,
                                 nux::NuxEventType event_type) override;
 };

=== modified file 'lockscreen/LockScreenAbstractShield.h'
--- lockscreen/LockScreenAbstractShield.h	2014-06-23 19:42:24 +0000
+++ lockscreen/LockScreenAbstractShield.h	2014-12-08 22:21:12 +0000
@@ -32,20 +32,29 @@
 namespace lockscreen
 {
 
+class UserPromptView;
+
 class AbstractShield : public MockableBaseWindow
 {
 public:
-  AbstractShield(session::Manager::Ptr const& session, indicator::Indicators::Ptr const& indicators, Accelerators::Ptr const& accelerators, int monitor_num, bool is_primary)
+  AbstractShield(session::Manager::Ptr const& session,
+                 indicator::Indicators::Ptr const& indicators,
+                 Accelerators::Ptr const& accelerators,
+                 nux::ObjectPtr<UserPromptView> const& prompt_view,
+                 int monitor_num, bool is_primary)
     : MockableBaseWindow("Unity Lockscreen")
     , primary(is_primary)
     , monitor(monitor_num)
+    , scale(1.0)
     , session_manager_(session)
     , indicators_(indicators)
     , accelerators_(accelerators)
+    , prompt_view_(prompt_view)
   {}
 
   nux::Property<bool> primary;
   nux::Property<int> monitor;
+  nux::Property<double> scale;
 
   using MockableBaseWindow::RemoveLayout;
   virtual bool IsIndicatorOpen() const = 0;
@@ -58,6 +67,7 @@
   session::Manager::Ptr session_manager_;
   indicator::Indicators::Ptr indicators_;
   Accelerators::Ptr accelerators_;
+  nux::ObjectPtr<UserPromptView> prompt_view_;
 };
 
 } // lockscreen

=== modified file 'lockscreen/LockScreenController.cpp'
--- lockscreen/LockScreenController.cpp	2014-08-06 14:11:17 +0000
+++ lockscreen/LockScreenController.cpp	2014-12-08 22:21:12 +0000
@@ -190,8 +190,17 @@
   int shields_size = shields_.size();
   int primary = UScreen::GetDefault()->GetMonitorWithMouse();
 
+  // Keep a reference of the old prompt_view
+  nux::ObjectPtr<UserPromptView> prompt_view(prompt_view_.GetPointer());
+
   shields_.resize(num_monitors);
 
+  if (!prompt_view)
+  {
+    prompt_view = test_mode_ ? nullptr : new UserPromptView(session_manager_);
+    prompt_view_ = prompt_view.GetPointer();
+  }
+
   for (int i = 0; i < num_monitors; ++i)
   {
     auto& shield = shields_[i];
@@ -199,7 +208,7 @@
 
     if (i >= shields_size)
     {
-      shield = shield_factory_->CreateShield(session_manager_, indicators_, accelerator_controller_->GetAccelerators(), i, i == primary);
+      shield = shield_factory_->CreateShield(session_manager_, indicators_, accelerator_controller_->GetAccelerators(), prompt_view, i, i == primary);
       is_new = true;
     }
 
@@ -208,7 +217,7 @@
 
     shield->SetGeometry(new_geo);
     shield->SetMinMaxSize(new_geo.width, new_geo.height);
-    shield->primary = (i == primary);
+    shield->primary = false;
     shield->monitor = i;
 
     // XXX: manually emit nux::Area::geometry_changed beucase nux can fail to emit it.

=== modified file 'lockscreen/LockScreenController.h'
--- lockscreen/LockScreenController.h	2014-06-23 19:21:17 +0000
+++ lockscreen/LockScreenController.h	2014-12-08 22:21:12 +0000
@@ -27,6 +27,7 @@
 #include "LockScreenShieldFactory.h"
 #include "LockScreenAcceleratorController.h"
 #include "ScreenSaverDBusManager.h"
+#include "UserPromptView.h"
 #include "unity-shared/BackgroundEffectHelper.h"
 #include "unity-shared/UpstartWrapper.h"
 
@@ -35,9 +36,13 @@
 namespace lockscreen
 {
 
+class UserPromptView;
+
 class Controller : public sigc::trackable
 {
 public:
+  typedef std::shared_ptr<Controller> Ptr;
+
   Controller(DBusManager::Ptr const&, session::Manager::Ptr const&,
              UpstartWrapper::Ptr const& upstart_wrapper = std::make_shared<UpstartWrapper>(),
              ShieldFactoryInterface::Ptr const& shield_factory = std::make_shared<ShieldFactory>(),
@@ -71,6 +76,7 @@
 
   std::vector<nux::ObjectPtr<AbstractShield>> shields_;
   nux::ObjectWeakPtr<AbstractShield> primary_shield_;
+  nux::ObjectWeakPtr<UserPromptView> prompt_view_;
   nux::ObjectPtr<nux::BaseWindow> blank_window_;
 
   DBusManager::Ptr dbus_manager_;

=== modified file 'lockscreen/LockScreenPanel.cpp'
--- lockscreen/LockScreenPanel.cpp	2014-06-23 15:29:36 +0000
+++ lockscreen/LockScreenPanel.cpp	2014-12-08 22:21:12 +0000
@@ -82,7 +82,9 @@
   indicators_->on_entry_activate_request.connect(sigc::mem_fun(this, &Panel::OnEntryActivateRequest));
 
   monitor.changed.connect([this, hostname] (int monitor) {
-    hostname->SetScale(unity::Settings::Instance().em(monitor)->DPIScale());
+    double scale = unity::Settings::Instance().em(monitor)->DPIScale();
+    hostname->SetScale(scale);
+    static_cast<nux::HLayout*>(GetLayout())->SetLeftAndRightPadding(PADDING.CP(scale), 0);
     indicators_view_->SetMonitor(monitor);
     BuildTexture();
     QueueRelayout();

=== modified file 'lockscreen/LockScreenSettings.cpp'
--- lockscreen/LockScreenSettings.cpp	2014-04-09 01:36:22 +0000
+++ lockscreen/LockScreenSettings.cpp	2014-12-08 22:21:12 +0000
@@ -55,6 +55,8 @@
 const std::string USE_OSK = "screen-keyboard-enabled";
 }
 
+const RawPixel Settings::GRID_SIZE = 40_em;
+
 struct Settings::Impl
 {
   Impl()

=== modified file 'lockscreen/LockScreenSettings.h'
--- lockscreen/LockScreenSettings.h	2014-04-09 01:36:22 +0000
+++ lockscreen/LockScreenSettings.h	2014-12-08 22:21:12 +0000
@@ -21,6 +21,7 @@
 #define UNITY_LOCKSCREEN_SETTINGS_H
 
 #include <NuxCore/Property.h>
+#include "unity-shared/RawPixel.h"
 
 namespace unity
 {
@@ -48,7 +49,7 @@
   nux::Property<bool> lock_on_suspend;
   nux::Property<bool> use_legacy;
 
-  static const int GRID_SIZE = 40;
+  static const RawPixel GRID_SIZE;
 
 private:
   struct Impl;

=== modified file 'lockscreen/LockScreenShield.cpp'
--- lockscreen/LockScreenShield.cpp	2014-08-06 14:11:17 +0000
+++ lockscreen/LockScreenShield.cpp	2014-12-08 22:21:12 +0000
@@ -30,6 +30,7 @@
 #include "LockScreenSettings.h"
 #include "UserPromptView.h"
 #include "unity-shared/UScreen.h"
+#include "unity-shared/UnitySettings.h"
 #include "unity-shared/WindowManager.h"
 
 namespace unity
@@ -42,19 +43,27 @@
 const unsigned MAX_GRAB_WAIT = 50;
 }
 
-Shield::Shield(session::Manager::Ptr const& session_manager, indicator::Indicators::Ptr const& indicators, Accelerators::Ptr const& accelerators, int monitor_num, bool is_primary)
-  : AbstractShield(session_manager, indicators, accelerators, monitor_num, is_primary)
+Shield::Shield(session::Manager::Ptr const& session_manager,
+               indicator::Indicators::Ptr const& indicators,
+               Accelerators::Ptr const& accelerators,
+               nux::ObjectPtr<UserPromptView> const& prompt_view,
+               int monitor_num, bool is_primary)
+  : AbstractShield(session_manager, indicators, accelerators, prompt_view, monitor_num, is_primary)
   , bg_settings_(std::make_shared<BackgroundSettings>())
-  , prompt_view_(nullptr)
   , panel_view_(nullptr)
+  , cof_view_(nullptr)
 {
+  UpdateScale();
   is_primary ? ShowPrimaryView() : ShowSecondaryView();
 
   EnableInputWindow(true);
 
+  unity::Settings::Instance().dpi_changed.connect(sigc::mem_fun(this, &Shield::UpdateScale));
   geometry_changed.connect([this] (nux::Area*, nux::Geometry&) { UpdateBackgroundTexture();});
 
   monitor.changed.connect([this] (int monitor) {
+    UpdateScale();
+
     if (panel_view_)
       panel_view_->monitor = monitor;
 
@@ -69,12 +78,31 @@
     QueueDraw();
   });
 
+  scale.changed.connect([this] (double scale) {
+    if (prompt_view_ && primary())
+      prompt_view_->scale = scale;
+
+    if (cof_view_)
+      cof_view_->scale = scale;
+
+    if (prompt_layout_)
+      prompt_layout_->SetLeftAndRightPadding(2 * Settings::GRID_SIZE.CP(scale));
+
+    background_layer_.reset();
+    UpdateBackgroundTexture();
+  });
+
   mouse_move.connect([this] (int x, int y, int, int, unsigned long, unsigned long) {
     auto const& abs_geo = GetAbsoluteGeometry();
     grab_motion.emit(abs_geo.x + x, abs_geo.y + y);
   });
 }
 
+void Shield::UpdateScale()
+{
+  scale = unity::Settings::Instance().em(monitor)->DPIScale();
+}
+
 void Shield::UpdateBackgroundTexture()
 {
   auto const& monitor_geo = UScreen::GetDefault()->GetMonitorGeometry(monitor);
@@ -116,6 +144,12 @@
 {
   if (primary_layout_)
   {
+    if (prompt_view_)
+    {
+      prompt_view_->scale = scale();
+      prompt_layout_->AddView(prompt_view_.GetPointer());
+    }
+
     GrabScreen(false);
     SetLayout(primary_layout_.GetPointer());
     return;
@@ -128,20 +162,26 @@
 
   main_layout->AddView(CreatePanel());
 
-  nux::HLayout* prompt_layout = new nux::HLayout();
-  prompt_layout->SetLeftAndRightPadding(2 * Settings::GRID_SIZE);
+  prompt_layout_ = new nux::HLayout();
+  prompt_layout_->SetLeftAndRightPadding(2 * Settings::GRID_SIZE.CP(scale));
 
-  prompt_view_ = CreatePromptView();
-  prompt_layout->AddView(prompt_view_);
+  if (prompt_view_)
+  {
+    prompt_view_->scale = scale();
+    prompt_layout_->AddView(prompt_view_.GetPointer());
+  }
 
   // 10 is just a random number to center the prompt view.
   main_layout->AddSpace(0, 10);
-  main_layout->AddLayout(prompt_layout);
+  main_layout->AddLayout(prompt_layout_.GetPointer());
   main_layout->AddSpace(0, 10);
 }
 
 void Shield::ShowSecondaryView()
 {
+  if (prompt_layout_)
+    prompt_layout_->RemoveChildObject(prompt_view_.GetPointer());
+
   if (cof_layout_)
   {
     SetLayout(cof_layout_.GetPointer());
@@ -153,8 +193,9 @@
   SetLayout(cof_layout_.GetPointer());
 
   // The circle of friends
-  CofView* cof_view = new CofView();
-  main_layout->AddView(cof_view);
+  cof_view_ = new CofView();
+  cof_view_->scale = scale();
+  main_layout->AddView(cof_view_);
 }
 
 Panel* Shield::CreatePanel()
@@ -182,20 +223,6 @@
   return panel_view_;
 }
 
-UserPromptView* Shield::CreatePromptView()
-{
-  auto* prompt_view = new UserPromptView(session_manager_);
-
-  auto width = 8 * Settings::GRID_SIZE;
-  auto height = 3 * Settings::GRID_SIZE;
-
-  prompt_view->SetMinimumWidth(width);
-  prompt_view->SetMaximumWidth(width);
-  prompt_view->SetMinimumHeight(height);
-
-  return prompt_view;
-}
-
 nux::Area* Shield::FindKeyFocusArea(unsigned etype, unsigned long keysym, unsigned long modifiers)
 {
   if (primary)

=== modified file 'lockscreen/LockScreenShield.h'
--- lockscreen/LockScreenShield.h	2014-08-06 14:11:17 +0000
+++ lockscreen/LockScreenShield.h	2014-12-08 22:21:12 +0000
@@ -33,11 +33,16 @@
 class UserAuthenticator;
 class UserPromptView;
 class Panel;
+class CofView;
 
 class Shield : public AbstractShield
 {
 public:
-  Shield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, Accelerators::Ptr const&, int monitor, bool is_primary);
+  Shield(session::Manager::Ptr const&,
+         indicator::Indicators::Ptr const&,
+         Accelerators::Ptr const&,
+         nux::ObjectPtr<UserPromptView> const&,
+         int monitor, bool is_primary);
 
   bool IsIndicatorOpen() const override;
   void ActivatePanel() override;
@@ -52,18 +57,19 @@
   void GrabScreen(bool cancel_on_failure);
   void ShowPrimaryView();
   void ShowSecondaryView();
+  void UpdateScale();
   Panel* CreatePanel();
-  UserPromptView* CreatePromptView();
 
   std::shared_ptr<BackgroundSettings> bg_settings_;
   std::unique_ptr<nux::AbstractPaintLayer> background_layer_;
   nux::ObjectPtr<nux::Layout> primary_layout_;
+  nux::ObjectPtr<nux::Layout> prompt_layout_;
   nux::ObjectPtr<nux::Layout> cof_layout_;
   connection::Wrapper panel_active_conn_;
   connection::Wrapper regrab_conn_;
   glib::Source::UniquePtr regrab_timeout_;
-  UserPromptView* prompt_view_;
   Panel* panel_view_;
+  CofView* cof_view_;
 };
 
 }

=== modified file 'lockscreen/LockScreenShieldFactory.cpp'
--- lockscreen/LockScreenShieldFactory.cpp	2014-04-17 13:08:05 +0000
+++ lockscreen/LockScreenShieldFactory.cpp	2014-12-08 22:21:12 +0000
@@ -19,15 +19,20 @@
 
 #include "LockScreenShieldFactory.h"
 #include "LockScreenShield.h"
+#include "UserPromptView.h"
 
 namespace unity
 {
 namespace lockscreen
 {
 
-nux::ObjectPtr<AbstractShield> ShieldFactory::CreateShield(session::Manager::Ptr const& session_manager, indicator::Indicators::Ptr const& indicators, Accelerators::Ptr const& accelerators, int monitor, bool is_primary)
+nux::ObjectPtr<AbstractShield> ShieldFactory::CreateShield(session::Manager::Ptr const& session_manager,
+                                                           indicator::Indicators::Ptr const& indicators,
+                                                           Accelerators::Ptr const& accelerators,
+                                                           nux::ObjectPtr<UserPromptView> const& prompt_view,
+                                                           int monitor, bool is_primary)
 {
-  return nux::ObjectPtr<Shield>(new Shield(session_manager, indicators, accelerators, monitor, is_primary));
+  return nux::ObjectPtr<Shield>(new Shield(session_manager, indicators, accelerators, prompt_view,  monitor, is_primary));
 }
 
 }

=== modified file 'lockscreen/LockScreenShieldFactory.h'
--- lockscreen/LockScreenShieldFactory.h	2014-04-17 13:08:05 +0000
+++ lockscreen/LockScreenShieldFactory.h	2014-12-08 22:21:12 +0000
@@ -31,18 +31,28 @@
 namespace lockscreen
 {
 
+class UserPromptView;
+
 struct ShieldFactoryInterface
 {
   typedef std::shared_ptr<ShieldFactoryInterface> Ptr;
 
   virtual ~ShieldFactoryInterface() = default;
 
-  virtual nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, Accelerators::Ptr const&, int monitor, bool is_primary) = 0;
+  virtual nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&,
+                                                      indicator::Indicators::Ptr const&,
+                                                      Accelerators::Ptr const&,
+                                                      nux::ObjectPtr<UserPromptView> const&,
+                                                      int monitor, bool is_primary) = 0;
 };
 
 struct ShieldFactory : ShieldFactoryInterface
 {
-  nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, Accelerators::Ptr const&, int monitor, bool is_primary) override;
+  nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&,
+                                              indicator::Indicators::Ptr const&,
+                                              Accelerators::Ptr const&,
+                                              nux::ObjectPtr<UserPromptView> const&,
+                                              int monitor, bool is_primary) override;
 };
 
 }

=== modified file 'lockscreen/UserPromptView.cpp'
--- lockscreen/UserPromptView.cpp	2014-07-24 14:03:10 +0000
+++ lockscreen/UserPromptView.cpp	2014-12-08 22:21:12 +0000
@@ -19,6 +19,9 @@
 
 #include "UserPromptView.h"
 
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <boost/algorithm/string/trim.hpp>
 #include <Nux/VLayout.h>
 
@@ -38,12 +41,12 @@
 const RawPixel LAYOUT_MARGIN        = 10_em;
 const RawPixel MSG_LAYOUT_MARGIN    = 15_em;
 const RawPixel PROMPT_LAYOUT_MARGIN =  5_em;
-
 const int PROMPT_FONT_SIZE = 13;
 
-nux::AbstractPaintLayer* CrateBackgroundLayer(int width, int height)
+nux::AbstractPaintLayer* CrateBackgroundLayer(double width, double height, double scale)
 {
   nux::CairoGraphics cg(CAIRO_FORMAT_ARGB32, width, height);
+  cairo_surface_set_device_scale(cg.GetSurface(), scale, scale);
   cairo_t* cr = cg.GetInternalContext();
 
   cairo_set_source_rgba(cr, 0.1, 0.1, 0.1, 0.4);
@@ -52,12 +55,12 @@
                           1.0,
                           0, 0,
                           Settings::GRID_SIZE * 0.3,
-                          width, height);
+                          width/scale, height/scale);
 
   cairo_fill_preserve(cr);
 
-  cairo_set_source_rgba (cr, 0.4, 0.4, 0.4, 0.4);
-  cairo_set_line_width (cr, 1);
+  cairo_set_source_rgba(cr, 0.4, 0.4, 0.4, 0.4);
+  cairo_set_line_width(cr, 1);
   cairo_stroke (cr);
 
   // Create the texture layer
@@ -98,7 +101,11 @@
 
 UserPromptView::UserPromptView(session::Manager::Ptr const& session_manager)
   : nux::View(NUX_TRACKER_LOCATION)
+  , scale(1.0)
   , session_manager_(session_manager)
+  , username_(nullptr)
+  , msg_layout_(nullptr)
+  , prompt_layout_(nullptr)
 {
   user_authenticator_.echo_on_requested.connect([this](std::string const& message, PromiseAuthCodePtr const& promise){
     AddPrompt(message, /* visible */ true, promise);
@@ -120,12 +127,65 @@
     ResetLayout();
   });
 
+  scale.changed.connect(sigc::hide(sigc::mem_fun(this, &UserPromptView::UpdateSize)));
+
+  UpdateSize();
   ResetLayout();
 
   user_authenticator_.AuthenticateStart(session_manager_->UserName(),
                                         sigc::mem_fun(this, &UserPromptView::AuthenticationCb));
 }
 
+void UserPromptView::UpdateSize()
+{
+  auto width = 8 * Settings::GRID_SIZE.CP(scale);
+  auto height = 3 * Settings::GRID_SIZE.CP(scale);
+
+  SetMinimumWidth(width);
+  SetMaximumWidth(width);
+  SetMinimumHeight(height);
+
+  if (nux::Layout* layout = GetLayout())
+  {
+    layout->SetLeftAndRightPadding(PADDING.CP(scale));
+    layout->SetTopAndBottomPadding(PADDING.CP(scale));
+    static_cast<nux::VLayout*>(layout)->SetVerticalInternalMargin(LAYOUT_MARGIN.CP(scale));
+  }
+
+  if (username_)
+    username_->SetScale(scale);
+
+  if (msg_layout_)
+  {
+    msg_layout_->SetVerticalInternalMargin(MSG_LAYOUT_MARGIN.CP(scale));
+
+    for (auto* area : msg_layout_->GetChildren())
+    {
+      area->SetMaximumWidth(width);
+      static_cast<StaticCairoText*>(area)->SetScale(scale);
+    }
+  }
+
+  if (prompt_layout_)
+  {
+    prompt_layout_->SetVerticalInternalMargin(PROMPT_LAYOUT_MARGIN.CP(scale));
+
+    for (auto* area : prompt_layout_->GetChildren())
+    {
+      auto* text_input = static_cast<TextInput*>(area);
+      text_input->SetMinimumHeight(Settings::GRID_SIZE.CP(scale));
+      text_input->SetMaximumHeight(Settings::GRID_SIZE.CP(scale));
+      text_input->scale = scale();
+    }
+  }
+
+  bg_layer_.reset();
+
+  ComputeContentSize();
+  QueueRelayout();
+  QueueDraw();
+}
+
 bool UserPromptView::InspectKeyEvent(unsigned int eventType, unsigned int key_sym, const char* character)
 {
   if ((eventType == nux::NUX_KEYDOWN) && (key_sym == NUX_VK_ESCAPE))
@@ -145,24 +205,25 @@
 
   SetLayout(new nux::VLayout());
 
-  GetLayout()->SetLeftAndRightPadding(PADDING);
-  GetLayout()->SetTopAndBottomPadding(PADDING);
-  static_cast<nux::VLayout*>(GetLayout())->SetVerticalInternalMargin(LAYOUT_MARGIN);
+  GetLayout()->SetLeftAndRightPadding(PADDING.CP(scale));
+  GetLayout()->SetTopAndBottomPadding(PADDING.CP(scale));
+  static_cast<nux::VLayout*>(GetLayout())->SetVerticalInternalMargin(LAYOUT_MARGIN.CP(scale));
 
   auto const& real_name = session_manager_->RealName();
   auto const& name = (real_name.empty() ? session_manager_->UserName() : real_name);
 
-  unity::StaticCairoText* username = new unity::StaticCairoText(name);
-  username->SetFont("Ubuntu "+std::to_string(PROMPT_FONT_SIZE));
-  GetLayout()->AddView(username);
+  username_ = new unity::StaticCairoText(name);
+  username_->SetScale(scale);
+  username_->SetFont("Ubuntu "+std::to_string(PROMPT_FONT_SIZE));
+  GetLayout()->AddView(username_);
 
   msg_layout_ = new nux::VLayout();
-  msg_layout_->SetVerticalInternalMargin(MSG_LAYOUT_MARGIN);
+  msg_layout_->SetVerticalInternalMargin(MSG_LAYOUT_MARGIN.CP(scale));
   msg_layout_->SetReconfigureParentLayoutOnGeometryChange(true);
   GetLayout()->AddLayout(msg_layout_);
 
   prompt_layout_ = new nux::VLayout();
-  prompt_layout_->SetVerticalInternalMargin(PROMPT_LAYOUT_MARGIN);
+  prompt_layout_->SetVerticalInternalMargin(PROMPT_LAYOUT_MARGIN.CP(scale));
   prompt_layout_->SetReconfigureParentLayoutOnGeometryChange(true);
   GetLayout()->AddLayout(prompt_layout_);
 
@@ -187,6 +248,21 @@
   }
 }
 
+void UserPromptView::EnsureBGLayer()
+{
+  auto const& geo = GetGeometry();
+
+  if (bg_layer_)
+  {
+    auto const& layer_geo = bg_layer_->GetGeometry();
+
+    if (layer_geo.width == geo.width && layer_geo.height == geo.height)
+      return;
+  }
+
+  bg_layer_.reset(CrateBackgroundLayer(geo.width, geo.height, scale));
+}
+
 void UserPromptView::Draw(nux::GraphicsEngine& graphics_engine, bool /* force_draw */)
 {
   nux::Geometry const& geo = GetGeometry();
@@ -194,7 +270,7 @@
   graphics_engine.PushClippingRectangle(geo);
   nux::GetPainter().PaintBackground(graphics_engine, geo);
 
-  bg_layer_.reset(CrateBackgroundLayer(geo.width, geo.height));
+  EnsureBGLayer();
   nux::GetPainter().PushDrawLayer(graphics_engine, geo, bg_layer_.get());
 
   nux::GetPainter().PopBackground();
@@ -208,7 +284,7 @@
 
   if (!IsFullRedraw())
   {
-    bg_layer_.reset(CrateBackgroundLayer(geo.width, geo.height));
+    EnsureBGLayer();
     nux::GetPainter().PushLayer(graphics_engine, geo, bg_layer_.get());
   }
 
@@ -238,6 +314,7 @@
   auto* text_input = new unity::TextInput();
   auto* text_entry = text_input->text_entry();
 
+  text_input->scale = scale();
   text_input->input_hint = SanitizeMessage(message);
   text_input->hint_font_size = PROMPT_FONT_SIZE;
   text_input->show_caps_lock = true;
@@ -246,8 +323,8 @@
   text_entry->SetToggleCursorVisibilityOnKeyFocus(true);
   text_entry->clipboard_enabled = false;
 
-  text_input->SetMinimumHeight(Settings::GRID_SIZE);
-  text_input->SetMaximumHeight(Settings::GRID_SIZE);
+  text_input->SetMinimumHeight(Settings::GRID_SIZE.CP(scale));
+  text_input->SetMaximumHeight(Settings::GRID_SIZE.CP(scale));
   prompt_layout_->AddView(text_input, 1);
   focus_queue_.push_back(text_input);
 
@@ -288,6 +365,7 @@
 {
   nux::Geometry const& geo = GetGeometry();
   auto* view = new unity::StaticCairoText("");
+  view->SetScale(scale);
   view->SetFont(Settings::Instance().font_name());
   view->SetTextColor(color);
   view->SetText(message);

=== modified file 'lockscreen/UserPromptView.h'
--- lockscreen/UserPromptView.h	2014-04-16 19:19:41 +0000
+++ lockscreen/UserPromptView.h	2014-12-08 22:21:12 +0000
@@ -48,7 +48,8 @@
 {
 public:
   UserPromptView(session::Manager::Ptr const& session_manager);
-  ~UserPromptView() {};
+
+  nux::Property<double> scale;
 
   nux::View* focus_view();
 
@@ -62,17 +63,17 @@
 
 private:
   void ResetLayout();
+  void UpdateSize();
+  void EnsureBGLayer();
 
   bool InspectKeyEvent(unsigned int eventType, unsigned int key_sym, const char* character);
 
   session::Manager::Ptr session_manager_;
   UserAuthenticatorPam user_authenticator_;
   std::shared_ptr<nux::AbstractPaintLayer> bg_layer_;
+  StaticCairoText* username_;
   nux::VLayout* msg_layout_;
   nux::VLayout* prompt_layout_;
-  StaticCairoText* message_;
-  StaticCairoText* error_;
-  StaticCairoText* invalid_login_;
   std::deque<TextInput*> focus_queue_;
 
   nux::Geometry cached_focused_geo_;

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-08-06 14:19:10 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-12-08 22:21:12 +0000
@@ -3999,7 +3999,7 @@
   return launcher_controller_;
 }
 
-std::shared_ptr<lockscreen::Controller> UnityScreen::lockscreen_controller()
+lockscreen::Controller::Ptr UnityScreen::lockscreen_controller()
 {
   return lockscreen_controller_;
 }

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2014-07-24 14:14:47 +0000
+++ plugins/unityshell/src/unityshell.h	2014-12-08 22:21:12 +0000
@@ -239,7 +239,7 @@
 
   switcher::Controller::Ptr switcher_controller();
   launcher::Controller::Ptr launcher_controller();
-  std::shared_ptr<lockscreen::Controller> lockscreen_controller();
+  lockscreen::Controller::Ptr lockscreen_controller();
 
   bool DoesPointIntersectUnityGeos(nux::Point const& pt);
 
@@ -348,7 +348,7 @@
   session::DBusManager::Ptr session_dbus_manager_;
   session::Controller::Ptr  session_controller_;
   lockscreen::DBusManager::Ptr screensaver_dbus_manager_;
-  std::shared_ptr<lockscreen::Controller> lockscreen_controller_;
+  lockscreen::Controller::Ptr lockscreen_controller_;
   debug::DebugDBusInterface debugger_;
   std::unique_ptr<BGHash>   bghash_;
   spread::Filter::Ptr       spread_filter_;

=== modified file 'tests/test_lockscreen_controller.cpp'
--- tests/test_lockscreen_controller.cpp	2014-06-23 19:42:24 +0000
+++ tests/test_lockscreen_controller.cpp	2014-12-08 22:21:12 +0000
@@ -20,6 +20,7 @@
 #include <gmock/gmock.h>
 using namespace testing;
 
+#include "lockscreen/UserPromptView.h"
 #include "lockscreen/LockScreenController.h"
 
 #include <Nux/NuxTimerTickSource.h>
@@ -29,6 +30,7 @@
 
 #include "lockscreen/LockScreenSettings.h"
 #include "lockscreen/ScreenSaverDBusManager.h"
+#include "unity-shared/DashStyle.h"
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/UScreen.h"
 #include "test_mock_session_manager.h"
@@ -52,7 +54,7 @@
 struct MockShield : AbstractShield
 {
   MockShield()
-    : AbstractShield(nullptr, nullptr, nullptr, 0, false)
+    : AbstractShield(nullptr, nullptr, nullptr, nux::ObjectPtr<UserPromptView>(), 0, false)
   {}
 
   MOCK_CONST_METHOD0(IsIndicatorOpen, bool());
@@ -61,7 +63,11 @@
 
 struct ShieldFactoryMock : ShieldFactoryInterface
 {
-  nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, Accelerators::Ptr const&, int, bool) override
+  nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&,
+                                              indicator::Indicators::Ptr const&,
+                                              Accelerators::Ptr const&,
+                                              nux::ObjectPtr<UserPromptView> const&,
+                                              int, bool) override
   {
     return nux::ObjectPtr<AbstractShield>(new MockShield());
   }
@@ -95,6 +101,7 @@
   nux::animation::AnimationController animation_controller;
 
   MockUScreen uscreen;
+  unity::dash::Style dash_style;
   unity::panel::Style panel_style;
   unity::lockscreen::Settings lockscreen_settings;
   session::MockManager::Ptr session_manager;

=== modified file 'tests/test_previews_music_payment.cpp'
--- tests/test_previews_music_payment.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_previews_music_payment.cpp	2014-12-08 22:21:12 +0000
@@ -21,6 +21,7 @@
 #include <gmock/gmock.h>
 
 #include <Nux/Nux.h>
+#include <Nux/VLayout.h>
 #include <Nux/BaseWindow.h>
 #include <unity-shared/StaticCairoText.h>
 #include <unity-shared/CoverArt.h>

=== modified file 'tests/test_text_input.cpp'
--- tests/test_text_input.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_text_input.cpp	2014-12-08 22:21:12 +0000
@@ -23,6 +23,7 @@
 #include <gtest/gtest.h>
 
 #include "unity-shared/DashStyle.h"
+#include "unity-shared/StaticCairoText.h"
 #include "unity-shared/TextInput.h"
 #include "test_utils.h"
 

=== modified file 'unity-shared/IconTexture.cpp'
--- unity-shared/IconTexture.cpp	2014-07-24 13:49:53 +0000
+++ unity-shared/IconTexture.cpp	2014-12-08 22:21:12 +0000
@@ -142,7 +142,7 @@
                                                            -1, _size,
                                                            sigc::mem_fun(this, &IconTexture::IconLoaded));
   }
-  else if (_icon_name.find("http://") == 0)
+  else if (_icon_name.find("://") != std::string::npos)
   {
     _handle = IconLoader::GetDefault().LoadFromURI(_icon_name,
                                                    -1, _size, sigc::mem_fun(this, &IconTexture::IconLoaded));

=== modified file 'unity-shared/SearchBar.cpp'
--- unity-shared/SearchBar.cpp	2014-07-24 14:03:10 +0000
+++ unity-shared/SearchBar.cpp	2014-12-08 22:21:12 +0000
@@ -20,17 +20,24 @@
 #include "config.h"
 
 #include <Nux/Nux.h>
+#include <Nux/LayeredLayout.h>
 #include <Nux/HLayout.h>
 #include <Nux/VLayout.h>
+#include <Nux/TextEntry.h>
 #include <NuxCore/Logger.h>
 
+#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
 #include "SearchBar.h"
 #include "CairoTexture.h"
 #include "DashStyle.h"
 #include "GraphicsUtils.h"
+#include "IconTexture.h"
+#include "IMTextEntry.h"
 #include "RawPixel.h"
+#include "SearchBarSpinner.h"
+#include "StaticCairoText.h"
 #include "UnitySettings.h"
 
 namespace unity
@@ -252,9 +259,8 @@
     expand_icon_->mouse_click.connect(mouse_expand);
   }
 
-  sig_manager_.Add<void, GtkSettings*, GParamSpec*>(gtk_settings_get_default(), "notify::gtk-font-name",
-                                                    sigc::mem_fun(this, &SearchBar::OnFontChanged));
-  OnFontChanged(gtk_settings_get_default());
+  sig_manager_.Add<void, GtkSettings*>(gtk_settings_get_default(), "notify::gtk-font-name", sigc::hide(sigc::mem_fun(this, &SearchBar::OnFontChanged)));
+  OnFontChanged();
 
   search_hint.changed.connect([this](std::string const& s) { OnSearchHintChanged(); });
   search_string.SetGetterFunction(sigc::mem_fun(this, &SearchBar::get_search_string));
@@ -347,13 +353,13 @@
   UpdateSearchBarSize();
 }
 
-void SearchBar::OnFontChanged(GtkSettings* settings, GParamSpec* pspec)
+void SearchBar::OnFontChanged()
 {
   glib::String font_name;
   PangoFontDescription* desc;
   std::ostringstream font_desc;
 
-  g_object_get(settings, "gtk-font-name", &font_name, NULL);
+  g_object_get(gtk_settings_get_default(), "gtk-font-name", &font_name, NULL);
 
   desc = pango_font_description_from_string(font_name.Value());
   if (desc)
@@ -586,7 +592,7 @@
   cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 0.7f);
   cairo_stroke(cr);
 
-  nux::BaseTexture* texture2D = texture_from_cairo_graphics(cairo_graphics);
+  auto texture2D = texture_ptr_from_cairo_graphics(cairo_graphics);
 
   nux::TexCoordXForm texxform;
   texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
@@ -602,8 +608,6 @@
                                         nux::color::White,
                                         true,
                                         rop));
-
-  texture2D->UnReference();
 }
 
 void SearchBar::OnMouseButtonDown(int x, int y, unsigned long button, unsigned long key)

=== modified file 'unity-shared/SearchBar.h'
--- unity-shared/SearchBar.h	2014-03-20 04:05:39 +0000
+++ unity-shared/SearchBar.h	2014-12-08 22:21:12 +0000
@@ -20,28 +20,28 @@
 #ifndef SEARCH_BAR_H
 #define SEARCH_BAR_H
 
-#include <gtk/gtk.h>
+#include <Nux/TextEntry.h>
 #include <NuxCore/Property.h>
-#include <Nux/LayeredLayout.h>
-#include <Nux/VLayout.h>
-#include <Nux/TextEntry.h>
 #include <UnityCore/GLibSignal.h>
 #include <UnityCore/GLibSource.h>
 
-#include "SearchBarSpinner.h"
-#include "unity-shared/IconTexture.h"
-#include "unity-shared/IMTextEntry.h"
 #include "unity-shared/Introspectable.h"
-#include "unity-shared/StaticCairoText.h"
 
 namespace nux
 {
 class AbstractPaintLayer;
+class LayeredLayout;
 class LinearLayout;
+class SpaceLayout;
+class VLayout;
 }
 
 namespace unity
 {
+class IconTexture;
+class IMTextEntry;
+class SearchBarSpinner;
+class StaticCairoText;
 
 class SearchBar : public unity::debug::Introspectable, public nux::View
 {
@@ -71,7 +71,7 @@
   sigc::signal<void, std::string const&> live_search_reached;
 
 private:
-  void OnFontChanged(GtkSettings* settings, GParamSpec* pspec=NULL);
+  void OnFontChanged();
   void OnSearchHintChanged();
 
   void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);

=== modified file 'unity-shared/SearchBarSpinner.h'
--- unity-shared/SearchBarSpinner.h	2014-07-24 14:14:47 +0000
+++ unity-shared/SearchBarSpinner.h	2014-12-08 22:21:12 +0000
@@ -22,8 +22,6 @@
 
 #include <Nux/Nux.h>
 #include <Nux/View.h>
-#include <NuxGraphics/GraphicsEngine.h>
-#include <Nux/TextureArea.h>
 #include <NuxCore/Math/Matrix4.h>
 #include <UnityCore/GLibSource.h>
 #include "unity-shared/Introspectable.h"

=== modified file 'unity-shared/SpreadFilter.cpp'
--- unity-shared/SpreadFilter.cpp	2014-07-24 14:03:10 +0000
+++ unity-shared/SpreadFilter.cpp	2014-12-08 22:21:12 +0000
@@ -20,11 +20,13 @@
 #include "SpreadFilter.h"
 
 #include <Nux/HLayout.h>
+#include <UnityCore/GLibWrapper.h>
+
 #include "AnimationUtils.h"
+#include "ApplicationManager.h"
 #include "SearchBar.h"
 #include "UnitySettings.h"
 #include "WindowManager.h"
-#include "ApplicationManager.h"
 #include "RawPixel.h"
 
 namespace unity

=== modified file 'unity-shared/TextInput.cpp'
--- unity-shared/TextInput.cpp	2014-08-06 14:15:32 +0000
+++ unity-shared/TextInput.cpp	2014-12-08 22:21:12 +0000
@@ -17,24 +17,38 @@
  * Authored by: Manuel de la Pena <[e-mail]>
  */
 
+#include "config.h"
 #include "TextInput.h"
-#include "unity-shared/IconTexture.h"
-#include "unity-shared/DashStyle.h"
-#include "unity-shared/RawPixel.h"
-#include "unity-shared/PreviewStyle.h"
+
+#include <gtk/gtk.h>
+#include <glib/gi18n-lib.h>
+
+#include <Nux/LayeredLayout.h>
+#include <Nux/HLayout.h>
+#include <Nux/VLayout.h>
+#include <NuxCore/Logger.h>
+
+#include "CairoTexture.h"
+#include "StaticCairoText.h"
+#include "IconTexture.h"
+#include "IMTextEntry.h"
+#include "DashStyle.h"
+#include "PreviewStyle.h"
+#include "RawPixel.h"
+#include "TextureCache.h"
+#include "UnitySettings.h"
 
 namespace unity
 {
 
 namespace
 {
-const float kExpandDefaultIconOpacity = 1.0f;
-
-const int SPACE_BETWEEN_ENTRY_AND_HIGHLIGHT = 10;
-const int LEFT_INTERNAL_PADDING = 6;
-const int TEXT_INPUT_RIGHT_BORDER = 10;
-
-const int HIGHLIGHT_HEIGHT = 24;
+const int BORDER_RADIUS = 5;
+const int TOOLTIP_WAIT = 500;
+const RawPixel SPACE_BETWEEN_ENTRY_AND_HIGHLIGHT = 10_em;
+const RawPixel LEFT_INTERNAL_PADDING = 6_em;
+const RawPixel TEXT_INPUT_RIGHT_BORDER = 10_em;
+const RawPixel HINT_PADDING = 3_em;
 
 const RawPixel TOOLTIP_Y_OFFSET  =  3_em;
 const RawPixel TOOLTIP_OFFSET    = 10_em;
@@ -46,15 +60,11 @@
 const int HINT_LABEL_FONT_SIZE = 11;
 
 const std::string PANGO_ENTRY_DEFAULT_FONT_FAMILY = "Ubuntu";
-const int PANGO_ENTRY_FONT_SIZE = 14;
-
-}
+const RawPixel PANGO_ENTRY_FONT_SIZE = 14_em;
 
 nux::logging::Logger logger("unity.textinput");
 
-NUX_IMPLEMENT_OBJECT_TYPE(TextInput);
-
-nux::AbstractPaintLayer* CreateWarningLayer(nux::BaseTexture* texture)
+std::shared_ptr<nux::AbstractPaintLayer> CreateWarningLayer(nux::BaseTexture* texture)
 {
   // Create the texture layer
   nux::TexCoordXForm texxform;
@@ -70,12 +80,11 @@
   rop.SrcBlend = GL_ONE;
   rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
 
-  return (new nux::TextureLayer(texture->GetDeviceTexture(),
-                                texxform,
-                                nux::color::White,
-                                true,
-                                rop));
-}
+  return std::make_shared<nux::TextureLayer>(texture->GetDeviceTexture(), texxform, nux::color::White, true, rop);
+}
+}
+
+NUX_IMPLEMENT_OBJECT_TYPE(TextInput);
 
 TextInput::TextInput(NUX_FILE_LINE_DECL)
   : View(NUX_FILE_LINE_PARAM)
@@ -83,30 +92,30 @@
   , hint_font_name(HINT_LABEL_DEFAULT_FONT_NAME)
   , hint_font_size(HINT_LABEL_FONT_SIZE)
   , show_caps_lock(false)
+  , scale(1.0)
   , bg_layer_(new nux::ColorLayer(nux::Color(0xff595853), true))
   , 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);
-  layout_->SetSpaceBetweenChildren(SPACE_BETWEEN_ENTRY_AND_HIGHLIGHT);
+  layout_->SetLeftAndRightPadding(LEFT_INTERNAL_PADDING.CP(scale), TEXT_INPUT_RIGHT_BORDER.CP(scale));
+  layout_->SetSpaceBetweenChildren(SPACE_BETWEEN_ENTRY_AND_HIGHLIGHT.CP(scale));
   SetLayout(layout_);
 
-  nux::HLayout* hint_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
-  hint_layout->SetLeftAndRightPadding(3, 3);
+  hint_layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
+  hint_layout_->SetLeftAndRightPadding(HINT_PADDING.CP(scale), HINT_PADDING.CP(scale));
 
   hint_ = new StaticCairoText("");
   hint_->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, 0.5f));
-  hint_layout->AddView(hint_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+  hint_->SetScale(scale);
+  hint_layout_->AddView(hint_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
   hint_font_name.changed.connect(sigc::hide(sigc::mem_fun(this, &TextInput::UpdateHintFont)));
   hint_font_size.changed.connect(sigc::hide(sigc::mem_fun(this, &TextInput::UpdateHintFont)));
   UpdateHintFont();
 
   pango_entry_ = new IMTextEntry();
   pango_entry_->SetFontFamily(PANGO_ENTRY_DEFAULT_FONT_FAMILY.c_str());
-  pango_entry_->SetFontSize(PANGO_ENTRY_FONT_SIZE);
   pango_entry_->cursor_moved.connect([this](int i) { QueueDraw(); });
   pango_entry_->mouse_down.connect(sigc::mem_fun(this, &TextInput::OnMouseButtonDown));
   pango_entry_->end_key_focus.connect(sigc::mem_fun(this, &TextInput::OnEndKeyFocus));
@@ -115,13 +124,15 @@
   });
 
   layered_layout_ = new nux::LayeredLayout();
-  layered_layout_->AddLayer(hint_layout);
+  layered_layout_->AddLayer(hint_layout_);
   layered_layout_->AddLayer(pango_entry_);
   layered_layout_->SetPaintAll(true);
   layered_layout_->SetActiveLayerN(1);
   layout_->AddView(layered_layout_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
 
-  warning_ = new IconTexture(LoadWarningIcon(DEFAULT_ICON_SIZE));
+  UpdateSize();
+
+  warning_ = new IconTexture(LoadWarningIcon(DEFAULT_ICON_SIZE.CP(scale)));
   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) {
@@ -133,21 +144,22 @@
     }
   });
 
-  show_caps_lock.changed.connect([this] (bool changed) {
-    if (!warning_tooltip_.IsValid())
-      LoadWarningTooltip();
-
-    CheckIfCapsLockOn();
-  });
-
+  show_caps_lock.changed.connect(sigc::hide(sigc::mem_fun(this, &TextInput::CheckIfCapsLockOn)));
+  scale.changed.connect(sigc::mem_fun(this, &TextInput::UpdateScale));
+  Settings::Instance().font_scaling.changed.connect(sigc::hide(sigc::mem_fun(this, &TextInput::UpdateSize)));
+
+  activator_ = new IconTexture(LoadActivatorIcon(DEFAULT_ICON_SIZE.CP(scale)));
   spinner_ = new SearchBarSpinner();
   spinner_->SetVisible(false);
-  spinner_->SetMinMaxSize(22, 22);
+  spinner_->scale = scale();
   layout_->AddView(spinner_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
-  sig_manager_.Add<void, GtkSettings*, GParamSpec*>(gtk_settings_get_default(),
-    "notify::gtk-font-name", sigc::mem_fun(this, &TextInput::OnFontChanged));
-  OnFontChanged(gtk_settings_get_default());
+  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();
@@ -160,16 +172,47 @@
   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();
+    tooltip_timeout_.reset(new glib::Timeout(TOOLTIP_WAIT, [this] {
+      tooltip_timeout_.reset();
+      QueueDraw();
+      return false;
+    }));
   });
 
   warning_->mouse_leave.connect([this] (int x, int y, int button, int key_flags) {
-    mouse_over_warning_icon_ = false;
-    QueueDraw();
+    tooltip_timeout_ ? tooltip_timeout_.reset() : QueueDraw();
   });
 }
 
+void TextInput::UpdateSize()
+{
+  pango_entry_->SetFontSize(PANGO_ENTRY_FONT_SIZE.CP(scale * Settings::Instance().font_scaling()));
+  int entry_min = pango_entry_->GetMinimumHeight();
+  pango_entry_->SetMaximumHeight(entry_min);
+  layered_layout_->SetMinimumHeight(entry_min);
+  layered_layout_->SetMaximumHeight(entry_min);
+}
+
+void TextInput::UpdateScale(double scale)
+{
+  layout_->SetLeftAndRightPadding(LEFT_INTERNAL_PADDING.CP(scale), TEXT_INPUT_RIGHT_BORDER.CP(scale));
+  layout_->SetSpaceBetweenChildren(SPACE_BETWEEN_ENTRY_AND_HIGHLIGHT.CP(scale));
+
+  UpdateSize();
+
+  hint_layout_->SetLeftAndRightPadding(HINT_PADDING.CP(scale), HINT_PADDING.CP(scale));
+  hint_->SetScale(scale);
+  hint_->SetMaximumHeight(pango_entry_->GetMinimumHeight());
+
+  spinner_->scale = scale;
+  activator_->SetTexture(LoadActivatorIcon(DEFAULT_ICON_SIZE.CP(scale)));
+  warning_->SetTexture(LoadWarningIcon(DEFAULT_ICON_SIZE.CP(scale)));
+  warning_tooltip_.Release();
+
+  QueueRelayout();
+  QueueDraw();
+}
+
 void TextInput::CheckIfCapsLockOn()
 {
   GdkKeymap* keymap = gdk_keymap_get_default();
@@ -179,6 +222,7 @@
 void TextInput::SetSpinnerVisible(bool visible)
 {
   spinner_->SetVisible(visible);
+  activator_->SetVisible(!visible && show_activator());
 }
 
 void TextInput::SetSpinnerState(SpinnerState spinner_state)
@@ -241,6 +285,7 @@
   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_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);
@@ -250,7 +295,8 @@
   extents.width  += TOOLTIP_OFFSET;
   extents.height += TOOLTIP_OFFSET;
 
-  nux::CairoGraphics cg(CAIRO_FORMAT_ARGB32, extents.width, extents.height);
+  nux::CairoGraphics cg(CAIRO_FORMAT_ARGB32, RawPixel(extents.width).CP(scale), RawPixel(extents.height).CP(scale));
+  cairo_surface_set_device_scale(cg.GetSurface(), scale, scale);
   cairo_t* cr = cg.GetInternalContext();
 
   gtk_render_background(style_context, cr, 0, 0, extents.width, extents.height);
@@ -260,27 +306,28 @@
   warning_tooltip_ = texture_ptr_from_cairo_graphics(cg);
 }
 
-void TextInput::OnFontChanged(GtkSettings* settings, GParamSpec* pspec)
+void TextInput::OnFontChanged()
 {
   glib::String font_name;
   PangoFontDescription* desc;
 
-  g_object_get(settings, "gtk-font-name", &font_name, NULL);
+  g_object_get(gtk_settings_get_default(), "gtk-font-name", &font_name, NULL);
 
   desc = pango_font_description_from_string(font_name.Value());
   if (desc)
   {
     pango_entry_->SetFontFamily(pango_font_description_get_family(desc));
-    pango_entry_->SetFontSize(PANGO_ENTRY_FONT_SIZE);
     pango_entry_->SetFontOptions(gdk_screen_get_font_options(gdk_screen_get_default()));
+    UpdateSize();
 
     if (hint_font_name() == HINT_LABEL_DEFAULT_FONT_NAME)
     {
       std::ostringstream font_desc;
       font_desc << pango_font_description_get_family(desc) << " " << hint_font_size();
       hint_->SetFont(font_desc.str().c_str());
-      pango_font_description_free(desc);
     }
+
+    pango_font_description_free(desc);
   }
 }
 
@@ -328,8 +375,8 @@
 
   layout_->ProcessDraw(GfxContext, force_draw);
 
-  if (caps_lock_on && mouse_over_warning_icon_)
-      PaintWarningTooltip(GfxContext);
+  if (caps_lock_on && warning_->IsMouseInside() && !tooltip_timeout_)
+    PaintWarningTooltip(GfxContext);
 
   if (!IsFullRedraw())
   {
@@ -345,42 +392,39 @@
 
 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,
+  nux::Geometry const& warning_geo = warning_->GetGeometry();
+
+  if (!warning_tooltip_.IsValid())
+    LoadWarningTooltip();
+
+  nux::Geometry tooltip_geo = {warning_geo.x - (warning_tooltip_->GetWidth() + TOOLTIP_OFFSET.CP(scale) / 2),
+                               warning_geo.y - TOOLTIP_Y_OFFSET.CP(scale),
                                warning_tooltip_->GetWidth(),
                                warning_tooltip_->GetHeight()};
 
-  nux::GetPainter().PushDrawLayer(graphics_engine, tooltip_geo, CreateWarningLayer(warning_tooltip_.GetPointer()));
+  auto const& warning_layer = CreateWarningLayer(warning_tooltip_.GetPointer());
+  nux::GetPainter().PushDrawLayer(graphics_engine, tooltip_geo, warning_layer.get());
 }
 
 void TextInput::UpdateBackground(bool force)
 {
-  int RADIUS = 5;
   nux::Geometry geo(GetGeometry());
 
-  LOG_DEBUG(logger) << "height: "
-  << geo.height << " - "
-  << layout_->GetGeometry().height << " - "
-  << pango_entry_->GetGeometry().height;
-
-  if (geo.width == last_width_
-      && geo.height == last_height_
-      && force == false)
+  if (geo.width == last_width_ && geo.height == last_height_ && !force)
     return;
 
   last_width_ = geo.width;
   last_height_ = geo.height;
 
   nux::CairoGraphics cairo_graphics(CAIRO_FORMAT_ARGB32, last_width_, last_height_);
+  cairo_surface_set_device_scale(cairo_graphics.GetSurface(), scale, scale);
   cairo_t* cr = cairo_graphics.GetInternalContext();
 
   cairo_graphics.DrawRoundedRectangle(cr,
                                       1.0f,
                                       0.5, 0.5,
-                                      RADIUS,
-                                      last_width_ - 1, last_height_ - 1,
+                                      BORDER_RADIUS,
+                                      (last_width_/scale) - 1, (last_height_/scale) - 1,
                                       false);
 
   cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
@@ -390,7 +434,7 @@
   cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 0.7f);
   cairo_stroke(cr);
 
-  nux::BaseTexture* texture2D = texture_from_cairo_graphics(cairo_graphics);
+  auto texture2D = texture_ptr_from_cairo_graphics(cairo_graphics);
 
   nux::TexCoordXForm texxform;
   texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
@@ -406,8 +450,6 @@
                                         nux::color::White,
                                         true,
                                         rop));
-
-  texture2D->UnReference();
 }
 
 void TextInput::OnMouseButtonDown(int x, int y, unsigned long button, unsigned long key)

=== modified file 'unity-shared/TextInput.h'
--- unity-shared/TextInput.h	2014-08-06 14:15:32 +0000
+++ unity-shared/TextInput.h	2014-12-08 22:21:12 +0000
@@ -20,36 +20,27 @@
 #ifndef TEXTINPUT_H
 #define TEXTINPUT_H
 
-#include "config.h"
-
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
 #include <Nux/Nux.h>
-#include <Nux/HLayout.h>
-#include <Nux/LayeredLayout.h>
-#include <Nux/VLayout.h>
-#include <Nux/TextEntry.h>
-#include <NuxCore/Logger.h>
-#include <NuxCore/Property.h>
 #include <UnityCore/GLibSignal.h>
 #include <UnityCore/GLibSource.h>
 
-#include "CairoTexture.h"
-#include "unity-shared/IconTexture.h"
-#include "unity-shared/IMTextEntry.h"
-#include "unity-shared/Introspectable.h"
-#include "unity-shared/SearchBarSpinner.h"
-#include "unity-shared/StaticCairoText.h"
+#include "Introspectable.h"
+#include "IMTextEntry.h"
+#include "SearchBarSpinner.h"
 
 namespace nux
 {
 class AbstractPaintLayer;
+class LayeredLayout;
 class LinearLayout;
+class HLayout;
 }
 
 namespace unity
 {
+class IconTexture;
+class StaticCairoText;
+class SearchBarSpinner;
 
 class TextInput : public unity::debug::Introspectable, public nux::View
 {
@@ -73,13 +64,16 @@
   nux::ROProperty<bool> im_active;
   nux::ROProperty<bool> im_preedit;
   nux::Property<bool> show_caps_lock;
+  nux::Property<double> scale;
 
 private:
-  void OnFontChanged(GtkSettings* settings, GParamSpec* pspec=NULL);
+  void OnFontChanged();
   void UpdateHintFont();
   void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
   void UpdateBackground(bool force);
+  void UpdateScale(double);
+  void UpdateSize();
 
   std::string GetName() const;
 
@@ -116,17 +110,18 @@
   std::unique_ptr<nux::AbstractPaintLayer> bg_layer_;
   std::unique_ptr<nux::AbstractPaintLayer> highlight_layer_;
   nux::HLayout* layout_;
+  nux::HLayout* hint_layout_;
   nux::LayeredLayout* layered_layout_;
   SearchBarSpinner* spinner_;
 
   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::Source::UniquePtr tooltip_timeout_;
   glib::SignalManager sig_manager_;
 };