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
=== modified file 'plugins/unityshell/src/HomeView.cpp'
--- plugins/unityshell/src/HomeView.cpp 2011-12-16 21:08:21 +0000
+++ plugins/unityshell/src/HomeView.cpp 2011-12-21 17:00:46 +0000
@@ -81,7 +81,7 @@
81void HomeView::SetupViews()81void HomeView::SetupViews()
82{82{
83 layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);83 layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
84 layout_->SetHorizontalExternalMargin(8);84 layout_->SetHorizontalExternalMargin(7);
8585
86 scroll_view_ = new HomeScrollView(new PlacesVScrollBar(NUX_TRACKER_LOCATION),86 scroll_view_ = new HomeScrollView(new PlacesVScrollBar(NUX_TRACKER_LOCATION),
87 NUX_TRACKER_LOCATION);87 NUX_TRACKER_LOCATION);
8888
=== modified file 'plugins/unityshell/src/PlacesGroup.cpp'
--- plugins/unityshell/src/PlacesGroup.cpp 2011-12-16 21:08:21 +0000
+++ plugins/unityshell/src/PlacesGroup.cpp 2011-12-21 17:00:46 +0000
@@ -66,7 +66,7 @@
6666
67 _cached_name = NULL;67 _cached_name = NULL;
68 _group_layout = new nux::VLayout("", NUX_TRACKER_LOCATION);68 _group_layout = new nux::VLayout("", NUX_TRACKER_LOCATION);
69 _group_layout->SetHorizontalExternalMargin(15);69 _group_layout->SetHorizontalExternalMargin(12);
70 _group_layout->SetVerticalExternalMargin(1);70 _group_layout->SetVerticalExternalMargin(1);
7171
72 _group_layout->AddLayout(new nux::SpaceLayout(15,15,15,15), 0);72 _group_layout->AddLayout(new nux::SpaceLayout(15,15,15,15), 0);