Unity

Merge lp:~azzar1/unity/fix-839467-revenge into lp:unity

  1. fix-839467-revenge
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 1795
Proposed branch: lp:~azzar1/unity/fix-839467-revenge
Merge into: lp:unity
Diff against target: 25 lines (+2/-2)
2 files modified
plugins/unityshell/src/HomeView.cpp (+1/-1)
plugins/unityshell/src/PlacesGroup.cpp (+1/-1)
To merge this branch: bzr merge lp:~azzar1/unity/fix-839467-revenge
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Approve
Review via email: mp+86587@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) wrote :

Looks ok, the star looks slightly (very slightly) different but probably it's a different issue. Approving!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/HomeView.cpp'
2--- plugins/unityshell/src/HomeView.cpp 2011-12-16 21:08:21 +0000
3+++ plugins/unityshell/src/HomeView.cpp 2011-12-21 17:00:46 +0000
4@@ -81,7 +81,7 @@
5 void HomeView::SetupViews()
6 {
7 layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
8- layout_->SetHorizontalExternalMargin(8);
9+ layout_->SetHorizontalExternalMargin(7);
10
11 scroll_view_ = new HomeScrollView(new PlacesVScrollBar(NUX_TRACKER_LOCATION),
12 NUX_TRACKER_LOCATION);
13
14=== modified file 'plugins/unityshell/src/PlacesGroup.cpp'
15--- plugins/unityshell/src/PlacesGroup.cpp 2011-12-16 21:08:21 +0000
16+++ plugins/unityshell/src/PlacesGroup.cpp 2011-12-21 17:00:46 +0000
17@@ -66,7 +66,7 @@
18
19 _cached_name = NULL;
20 _group_layout = new nux::VLayout("", NUX_TRACKER_LOCATION);
21- _group_layout->SetHorizontalExternalMargin(15);
22+ _group_layout->SetHorizontalExternalMargin(12);
23 _group_layout->SetVerticalExternalMargin(1);
24
25 _group_layout->AddLayout(new nux::SpaceLayout(15,15,15,15), 0);