Merge lp:~jrrowe89/unity/fix-for-bug-718880 into lp:unity

[Jamie Rowe]

Changes the quick list menu for the trash icon to be positioned as others are.

[Didier Roche-Tolomelli (didrocks)]

Thanks a lot for your patch. It looks good ;)

Before we merge it we need you to sign the Canonical contributer agreement. It's a quick, but necessary step to getting your code into the tree. Luckily you only need to sign it once and it will apply to all other Canonical project contributions you may make in the future. http://www.canonical.com/contributors Make sure to CC David Barth when you send it in.

review: Approve

[Jamie Rowe (jrrowe89)]

> Thanks a lot for your patch. It looks good ;)
>
> Before we merge it we need you to sign the Canonical contributer agreement.
> It's a quick, but necessary step to getting your code into the tree. Luckily
> you only need to sign it once and it will apply to all other Canonical project
> contributions you may make in the future.
> http://www.canonical.com/contributors Make sure to CC David Barth when you
> send it in.

Thanks, The email has been sent off. Now onto something a little more challlenging I think :)

[Didier Roche-Tolomelli (didrocks)]

excellent, merging, thanks for your work there! :)

[David Barth (dbarth)]

Jamie completed the (c) assignment process.

review: Approve

=== modified file 'src/TrashLauncherIcon.cpp'
--- src/TrashLauncherIcon.cpp	2011-02-09 02:32:44 +0000
+++ src/TrashLauncherIcon.cpp	2011-02-16 13:40:07 +0000
@@ -113,7 +113,7 @@
     
     int tip_x = _launcher->GetBaseWidth () + 1; //icon_x + icon_w;
     nux::Point3 center = GetCenter ();
-    int tip_y = center.y;
+    int tip_y = center.y+ _launcher->GetParent ()->GetGeometry ().y;
     QuicklistManager::Default ()->ShowQuicklist (_quicklist, tip_x, tip_y);
     nux::GetWindowCompositor ().SetAlwaysOnFrontWindow (_quicklist);
   }