Unity

Merge lp:~alexlauni/unity/right-side-emblems into lp:unity

  1. right-side-emblems
  2. Merge into trunk
Proposed by Alex Launi
Status: Merged
Approved by: Neil J. Patel
Approved revision: no longer in the source branch.
Merged at revision: 1224
Proposed branch: lp:~alexlauni/unity/right-side-emblems
Merge into: lp:unity
Diff against target: 12 lines (+2/-1)
1 file modified
src/Launcher.cpp (+2/-1)
To merge this branch: bzr merge lp:~alexlauni/unity/right-side-emblems
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Jason Smith Pending
Review via email: mp+60078@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) wrote :

Looks good, approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Launcher.cpp'
2--- src/Launcher.cpp 2011-04-22 22:42:44 +0000
3+++ src/Launcher.cpp 2011-05-05 15:24:13 +0000
4@@ -3669,7 +3669,8 @@
5
6 float emb_w = emblem->GetWidth ();
7 float emb_h = emblem->GetHeight ();
8- x = (*it).render_center.x - _icon_size/2.0f; // x = top left corner position of emblem
9+
10+ x = (*it).render_center.x - (w - emb_w); // puts right edge of emblem just over the edge of the launcher icon
11 y = (*it).render_center.y - _icon_size/2.0f; // y = top left corner position of emblem
12 z = (*it).render_center.z;
13