Merge lp:~bregma/unity/lp-1100120 into lp:unity

[Stephen M. Webb]

render the Dash frame all the way to the bottom of the screen (lp: #1100120)

= Problem description =

The bottom of the Dash frame is not rendered all the way to the bottom of the screen (lp: 1100120).

= The fix =

The clipping area for the dash when not rendered in fullscreen mode was calculated incorrectly. This was adjusted.

= Test coverage =

There are no tests for this. I tried to come up with some way to verify clipping values, but there are just too many magic adjustment values hardcoded in the rendering code that any exposure of the base values would require insane adjustments in test code, which would just increase the maintenance nightmare factorially.

This is just one of those visual-confirmation of rendered graphics kind of verification situations.

[Christopher Townsend (townsend)]

Although the border does extend further towards the bottom of the screen/Launcher, I can still see a gap:(

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3210
http://jenkins.qa.ubuntu.com/job/unity-ci/377/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/265

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

This should probably be tested some, but I found the following to work:

- nux::Geometry geo_border(content_geo.x, content_geo.y, larger_absolute_geo.width - content_geo.x, larger_absolute_geo.height - content_geo.y + excess_border);
+ nux::Geometry geo_border(content_geo.x, content_geo.y, larger_absolute_geo.width - content_geo.x, larger_absolute_geo.height);

[Brandon Schaefer (brandontschaefer)]

Loooks good to me!

review: Approve

[Christopher Townsend (townsend)]

review: Approve

=== modified file 'unity-shared/OverlayRenderer.cpp'
--- unity-shared/OverlayRenderer.cpp	2013-04-12 16:01:19 +0000
+++ unity-shared/OverlayRenderer.cpp	2013-09-19 22:09:43 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
- * Copyright (C) 2011 Canonical Ltd
+ * Copyright (C) 2011-2013 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -553,7 +553,7 @@
 
   if (Settings::Instance().form_factor() != FormFactor::NETBOOK || force_edges)
   {
-    nux::Geometry geo_border(content_geo.x, content_geo.y, larger_absolute_geo.width - content_geo.x, larger_absolute_geo.height - content_geo.y);
+    nux::Geometry geo_border(content_geo.x, content_geo.y, larger_absolute_geo.width - content_geo.x, larger_absolute_geo.height);
     gfx_context.PushClippingRectangle(geo_border);
   
     // Paint the edges