Merge lp:~townsend/unity/fix-quicklist-blur into lp:unity

[Christopher Townsend]

The logic to detect when a Quicklist may be off the screen did not take into account the default top size of 4, so any Quicklists near the bottom would have blur that was shifted down 4 pixels.

When a Quicklist was detected as being off the screen, the assignment of the variable that handles the top size did not also have the default offset of 4 pixels taken into account. This led to the Quicklist blur being shifted down 4 pixels when opening a Quicklist near the bottom of the screen.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3488
http://jenkins.qa.ubuntu.com/job/unity-ci/328/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/217
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/215
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/216

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

=== modified file 'launcher/QuicklistView.cpp'
--- launcher/QuicklistView.cpp	2013-01-09 13:59:58 +0000
+++ launcher/QuicklistView.cpp	2013-09-04 12:53:10 +0000
@@ -51,6 +51,7 @@
 namespace
 {
   const int ANCHOR_WIDTH = 10.0f;
+  const int TOP_SIZE = 4;
 }
 
 NUX_IMPLEMENT_OBJECT_TYPE(QuicklistView);
@@ -59,7 +60,7 @@
   : _anchorX(0)
   , _anchorY(0)
   , _labelText("QuicklistView 1234567890")
-  , _top_size(4)
+  , _top_size(TOP_SIZE)
   , _mouse_down(false)
   , _enable_quicklist_for_testing(false)
   , _anchor_width(10)
@@ -337,9 +338,9 @@
                            nux::GetWindowThread()->GetGraphicsDisplay().GetWindowHeight();
 
       if (offscreen_size > 0)
-        _top_size = offscreen_size;
+        _top_size = offscreen_size + TOP_SIZE;
       else
-        _top_size = 4;
+        _top_size = TOP_SIZE;
 
       int x = _anchorX - _padding;
       int y = _anchorY - _anchor_height / 2 - _top_size - _corner_radius - _padding;
@@ -1182,9 +1183,9 @@
                            nux::GetWindowThread()->GetGraphicsDisplay().GetWindowHeight();
 
       if (offscreen_size > 0)
-        _top_size = offscreen_size;
+        _top_size = offscreen_size + TOP_SIZE;
       else
-        _top_size = 4;
+        _top_size = TOP_SIZE;
 
       size_above_anchor = _top_size;
       int x = _anchorX - _padding;