Unity

Merge lp:~azzar1/unity/fix-741775 into lp:unity

  1. fix-741775
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Merged at revision: 1034
Proposed branch: lp:~azzar1/unity/fix-741775
Merge into: lp:unity
Diff against target: 16 lines (+2/-2)
1 file modified
src/Launcher.cpp (+2/-2)
To merge this branch: bzr merge lp:~azzar1/unity/fix-741775
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+54815@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Beautiful work Andrea!
Code and test are good, merging :)

Thanks again!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp 2011-03-24 14:37:16 +0000
+++ src/Launcher.cpp 2011-03-25 06:50:47 +0000
@@ -3339,10 +3339,10 @@
3339 int width = texture->GetWidth ();3339 int width = texture->GetWidth ();
3340 int height = texture->GetHeight ();3340 int height = texture->GetHeight ();
3341 3341
3342 int progress_width = _progress_bar_trough->GetWidth ();3342 int progress_width = _icon_size;
3343 int progress_height = _progress_bar_trough->GetHeight ();3343 int progress_height = _progress_bar_trough->GetHeight ();
33443344
3345 int fill_width = _progress_bar_fill->GetWidth ();3345 int fill_width = _icon_image_size - _icon_image_size_delta;
3346 int fill_height = _progress_bar_fill->GetHeight ();3346 int fill_height = _progress_bar_fill->GetHeight ();
3347 3347
3348 int fill_offset = (progress_width - fill_width) / 2;3348 int fill_offset = (progress_width - fill_width) / 2;