Merge lp:~townsend/unity/fix-icon-progress-bar into lp:unity

[Christopher Townsend]

Fixes the issue where the filling in of the progress bar over Launcher icons does not scale when using smaller or larger icon sizes than the default size of 48.

= Issue =
When using smaller or larger ions in the Launcher, the progress bar over the icons (ie, when copying large files) does not scale and will either show a gap in the progress bar when using small icons or the fill will be farther left of the bar when using larger icons. The default size of the icons is 48 and this works well.

= Fix =
Based on icon size 48 working well, the offset of the fill portion of the bar is 6. This is a ratio of 0.125. Using this same ratio for smaller and larger icons, the fill portion begins where is should.

= Test =
As this is a visual bug, no automated test can be used. Use the manual test described in the bug for verification.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3351
http://jenkins.qa.ubuntu.com/job/unity-ci/106/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/110
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/106/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/106

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/106/rebuild

review: Needs Fixing (continuous-integration)

[Allan LeSage (allanlesage)]

I believe this is a spurious Jenkins failure, will kick off another test run.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3351
http://jenkins.qa.ubuntu.com/job/unity-ci/107/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/107

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/107/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

8 +

This space can be avoided...

18 + int fill_offset = (int)((float)image_size * fill_offset_ratio);;
It would be nice if you'd use static_cast<float> instead (while casting to int shouldn't be needed at the end (also please remove the double ";;").

[Christopher Townsend (townsend)]

> 8 +
>
> This space can be avoided...
Ok, will do.

>
> 18 + int fill_offset = (int)((float)image_size * fill_offset_ratio);;
> It would be nice if you'd use static_cast<float> instead (while casting to int
> shouldn't be needed at the end (also please remove the double ";;").
Ok. Not sure how the double ";;" got in there:)

Will have this updated soon. Thanks!

[Christopher Townsend (townsend)]

Ok, branch is updated.

Also, here are some screenshots of this fixed.

Small icons: https://bugs.launchpad.net/unity/+bug/968680/+attachment/3690760/+files/Small%20icons%20progress%20fixed.png

Large icons: https://bugs.launchpad.net/unity/+bug/968680/+attachment/3690761/+files/Large%20icons%20progress%20fixed.png

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3352
http://jenkins.qa.ubuntu.com/job/unity-ci/108/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/108

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/108/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Cool, LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3353
http://jenkins.qa.ubuntu.com/job/unity-ci/110/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/110

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/110/rebuild

review: Approve (continuous-integration)

=== modified file 'unity-shared/IconRenderer.cpp'
--- unity-shared/IconRenderer.cpp	2013-04-23 00:49:38 +0000
+++ unity-shared/IconRenderer.cpp	2013-05-31 17:47:28 +0000
@@ -178,6 +178,7 @@
 
 const float edge_illumination_multiplier = 2.0f;
 const float glow_multiplier = 2.3f;
+const float fill_offset_ratio = 0.125f;
 } // anonymous namespace
 
 // The local namespace is purely for namespacing the file local variables below.
@@ -1058,7 +1059,7 @@
   int fill_width = image_size - (icon_size - image_size);
   int fill_height = textures_->progress_bar_fill->GetHeight();
 
-  int fill_offset = (progress_width - fill_width) / 2;
+  int fill_offset = static_cast<float>(image_size) * fill_offset_ratio;
 
   // We need to perform a barn doors effect to acheive the slide in and out
 
@@ -1068,12 +1069,12 @@
   if (bias < 0.0f)
   {
     // pulls the right edge in
-    right_edge -= (int)(-bias * (float) progress_width);
+    right_edge -= -bias * static_cast<float>(progress_width);
   }
   else if (bias > 0.0f)
   {
     // pulls the left edge in
-    left_edge += (int)(bias * progress_width);
+    left_edge += bias * static_cast<float>(progress_width);
   }
 
   int fill_y = (height - fill_height) / 2;