Merge lp:~3v1n0/unity/lockscreen-promptview-scaling-fix into lp:unity

[Marco Trevisan (Treviño)]

UserPromptView: don't hide local scale property

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4087
http://jenkins.qa.ubuntu.com/job/unity-ci/1428/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/78

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

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'lockscreen/KylinUserPromptView.cpp'
--- lockscreen/KylinUserPromptView.cpp	2016-01-15 01:41:04 +0000
+++ lockscreen/KylinUserPromptView.cpp	2016-03-16 10:58:25 +0000
@@ -81,7 +81,6 @@
 
 KylinUserPromptView::KylinUserPromptView(session::Manager::Ptr const& session_manager)
   : AbstractUserPromptView(session_manager)
-  , scale(1.0)
   , session_manager_(session_manager)
   , username_(nullptr)
   , msg_layout_(nullptr)
 
=== modified file 'lockscreen/KylinUserPromptView.h'
--- lockscreen/KylinUserPromptView.h	2015-12-07 03:09:28 +0000
+++ lockscreen/KylinUserPromptView.h	2016-03-16 10:58:25 +0000
@@ -46,8 +46,6 @@
 public:
   KylinUserPromptView(session::Manager::Ptr const& session_manager);
 
-  nux::Property<double> scale;
-
   nux::View* focus_view();
 
   void AddAvatar(std::string const& avatar_icon, int avatar_size);
 
=== modified file 'lockscreen/LockScreenAbstractPromptView.h'
--- lockscreen/LockScreenAbstractPromptView.h	2015-12-07 03:09:28 +0000
+++ lockscreen/LockScreenAbstractPromptView.h	2016-03-16 10:58:25 +0000
@@ -50,6 +50,7 @@
 public:
   AbstractUserPromptView(session::Manager::Ptr const& session_manager)
     : nux::View(NUX_TRACKER_LOCATION)
+    , scale(1.0)
     , session_manager_(session_manager)
   {}
 
 
=== modified file 'lockscreen/UserPromptView.cpp'
--- lockscreen/UserPromptView.cpp	2016-01-15 01:41:04 +0000
+++ lockscreen/UserPromptView.cpp	2016-03-16 10:58:25 +0000
@@ -101,7 +101,6 @@
 
 UserPromptView::UserPromptView(session::Manager::Ptr const& session_manager)
   : AbstractUserPromptView(session_manager)
-  , scale(1.0)
   , session_manager_(session_manager)
   , username_(nullptr)
   , msg_layout_(nullptr)
 
=== modified file 'lockscreen/UserPromptView.h'
--- lockscreen/UserPromptView.h	2015-11-23 09:24:10 +0000
+++ lockscreen/UserPromptView.h	2016-03-16 10:58:25 +0000
@@ -50,8 +50,6 @@
 public:
   UserPromptView(session::Manager::Ptr const& session_manager);
 
-  nux::Property<double> scale;
-
   nux::View* focus_view();
 
   void AddPrompt(std::string const& message, bool visible, PromiseAuthCodePtr const&);