Unity

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

  1. lockscreen-promptview-scaling-fix
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño) on 2016-03-16
Status: Merged
Approved by: Andrea Azzarone on 2016-03-17
Approved revision: 4087
Merged at revision: 4088
Proposed branch: lp:~3v1n0/unity/lockscreen-promptview-scaling-fix
Merge into: lp:unity
Diff against target: 61 lines (+1/-6)
5 files modified
lockscreen/KylinUserPromptView.cpp (+0/-1)
lockscreen/KylinUserPromptView.h (+0/-2)
lockscreen/LockScreenAbstractPromptView.h (+1/-0)
lockscreen/UserPromptView.cpp (+0/-1)
lockscreen/UserPromptView.h (+0/-2)
To merge this branch: bzr merge lp:~3v1n0/unity/lockscreen-promptview-scaling-fix
Reviewer Review Type Date Requested Status
Andrea Azzarone 2016-03-16 Approve on 2016-03-17
PS Jenkins bot continuous-integration Approve on 2016-03-16
Review via email: mp+289162@code.launchpad.net

Commit Message

UserPromptView: don't hide local scale property

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Andrea Azzarone (azzar1) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lockscreen/KylinUserPromptView.cpp'
2--- lockscreen/KylinUserPromptView.cpp 2016-01-15 01:41:04 +0000
3+++ lockscreen/KylinUserPromptView.cpp 2016-03-16 10:58:25 +0000
4@@ -81,7 +81,6 @@
5
6 KylinUserPromptView::KylinUserPromptView(session::Manager::Ptr const& session_manager)
7 : AbstractUserPromptView(session_manager)
8- , scale(1.0)
9 , session_manager_(session_manager)
10 , username_(nullptr)
11 , msg_layout_(nullptr)
12
13=== modified file 'lockscreen/KylinUserPromptView.h'
14--- lockscreen/KylinUserPromptView.h 2015-12-07 03:09:28 +0000
15+++ lockscreen/KylinUserPromptView.h 2016-03-16 10:58:25 +0000
16@@ -46,8 +46,6 @@
17 public:
18 KylinUserPromptView(session::Manager::Ptr const& session_manager);
19
20- nux::Property<double> scale;
21-
22 nux::View* focus_view();
23
24 void AddAvatar(std::string const& avatar_icon, int avatar_size);
25
26=== modified file 'lockscreen/LockScreenAbstractPromptView.h'
27--- lockscreen/LockScreenAbstractPromptView.h 2015-12-07 03:09:28 +0000
28+++ lockscreen/LockScreenAbstractPromptView.h 2016-03-16 10:58:25 +0000
29@@ -50,6 +50,7 @@
30 public:
31 AbstractUserPromptView(session::Manager::Ptr const& session_manager)
32 : nux::View(NUX_TRACKER_LOCATION)
33+ , scale(1.0)
34 , session_manager_(session_manager)
35 {}
36
37
38=== modified file 'lockscreen/UserPromptView.cpp'
39--- lockscreen/UserPromptView.cpp 2016-01-15 01:41:04 +0000
40+++ lockscreen/UserPromptView.cpp 2016-03-16 10:58:25 +0000
41@@ -101,7 +101,6 @@
42
43 UserPromptView::UserPromptView(session::Manager::Ptr const& session_manager)
44 : AbstractUserPromptView(session_manager)
45- , scale(1.0)
46 , session_manager_(session_manager)
47 , username_(nullptr)
48 , msg_layout_(nullptr)
49
50=== modified file 'lockscreen/UserPromptView.h'
51--- lockscreen/UserPromptView.h 2015-11-23 09:24:10 +0000
52+++ lockscreen/UserPromptView.h 2016-03-16 10:58:25 +0000
53@@ -50,8 +50,6 @@
54 public:
55 UserPromptView(session::Manager::Ptr const& session_manager);
56
57- nux::Property<double> scale;
58-
59 nux::View* focus_view();
60
61 void AddPrompt(std::string const& message, bool visible, PromiseAuthCodePtr const&);