Merge lp:~azzar1/unity/fix-1062375-6.0 into lp:unity/6.0

Proposed by Andrea Azzarone on 2012-10-08
Status: Merged
Approved by: Łukasz Zemczak on 2012-10-08
Approved revision: 2766
Merged at revision: 2768
Proposed branch: lp:~azzar1/unity/fix-1062375-6.0
Merge into: lp:unity/6.0
Diff against target: 25 lines (+3/-2)
2 files modified
panel/PanelController.cpp (+2/-1)
panel/PanelView.cpp (+1/-1)
To merge this branch: bzr merge lp:~azzar1/unity/fix-1062375-6.0
Reviewer Review Type Date Requested Status
Łukasz Zemczak 2012-10-08 Approve on 2012-10-08
Review via email: mp+128424@code.launchpad.net

Commit message

Fix gap between dash/panel gradient. (cherry-pick lp:unity rev 2809) (LP: #1062375)

Description of the change

== Problem ==
Gap between the dash gradient and the panel one.

== Test ==
Visual change. Not applicable.

http://ubuntuone.com/3bstAUQ6qxubtsDy2GVF6q

To post a comment you must log in.
Łukasz Zemczak (sil2100) wrote :

Tested, works for me. Visual change so no test = ok!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panel/PanelController.cpp'
2--- panel/PanelController.cpp 2012-09-14 10:56:00 +0000
3+++ panel/PanelController.cpp 2012-10-08 06:24:27 +0000
4@@ -301,7 +301,8 @@
5 }
6
7 Controller::Controller()
8- : pimpl(new Impl())
9+ : launcher_width(64)
10+ , pimpl(new Impl())
11 {
12 UScreen* screen = UScreen::GetDefault();
13 screen->changed.connect(sigc::mem_fun(this, &Controller::OnScreenChanged));
14
15=== modified file 'panel/PanelView.cpp'
16--- panel/PanelView.cpp 2012-10-01 15:12:05 +0000
17+++ panel/PanelView.cpp 2012-10-08 06:24:27 +0000
18@@ -63,7 +63,7 @@
19 , _opacity(1.0f)
20 , _monitor(0)
21 , _stored_dash_width(0)
22- , _launcher_width(0)
23+ , _launcher_width(64)
24 {
25 panel::Style::Instance().changed.connect(sigc::mem_fun(this, &PanelView::ForceUpdateBackground));
26

Subscribers

People subscribed via source and target branches