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

[Stephen M. Webb]

Move the Dash navbar out of the way while a Preview is open (lp: #1053313).

Moves the Dash navbar out of the way while a Preview is open (lp: #1053313).

[Brandon Schaefer (brandontschaefer)]

Looks good and confirmed working.

review: Approve

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2012-10-02 12:55:23 +0000
+++ dash/DashView.cpp	2012-10-03 16:39:42 +0000
@@ -500,6 +500,31 @@
   renderer_.DrawFull(graphics_engine, content_geo_, GetAbsoluteGeometry(), GetGeometry(), true);
 }
 
+/**
+ * Parametrically interpolates a value in one of two consecutive closed intervals.
+ *
+ * @param[in] p
+ * @param[in] start The left (least) value of the closed interval.
+ * @param[in] end1  The right (greatest) value of the closed interval,
+ *                  if start <= end1
+ * @param[in] end2  The right (greatest) value of the closed interval,
+ *                  if start > end1
+ *
+ * @returns the linear interpolation at @p p of the interval [start, end] where end
+ * is @p end1 if start <= @p end1, otherwise end is @end2.
+ */
+static float Interpolate2(float p, int start, int end1, int end2)
+{
+  float result = end2;
+  if (start < end2)
+  {
+    int end = start > end1 ? end2 : end1;
+    result = start + p * (end - start);
+  }
+
+  return result;
+}
+
 void DashView::DrawContent(nux::GraphicsEngine& graphics_engine, bool force_draw)
 {
   renderer_.DrawInner(graphics_engine, content_geo_, GetAbsoluteGeometry(), GetGeometry());
@@ -652,7 +677,7 @@
 
           graphics_engine.QRP_TexDesaturate(
             fade_out_value_ * layout_->GetX() + (1 - fade_out_value_) * final_x,
-            fade_out_value_ * (opening_row_y_ + opening_row_height_) + (1 - fade_out_value_) * final_y,
+            Interpolate2(1.0f - fade_out_value_, opening_row_y_ + opening_row_height_, final_y, layout_->GetHeight()),
             layout_->GetWidth() - filter_width,
             layout_->GetHeight() - opening_row_y_ - opening_row_height_,
             layout_copy_, texxform,
@@ -735,7 +760,7 @@
 
           graphics_engine.QRP_TexDesaturate(
             (1.0f - fade_in_value_) * layout_->GetX() + (fade_in_value_) * final_x,
-            (1.0f - fade_in_value_) * (opening_row_y_ + opening_row_height_) + (fade_in_value_) * final_y,
+            Interpolate2(fade_in_value_, opening_row_y_ + opening_row_height_, final_y, layout_->GetHeight()),
             layout_->GetWidth() - filter_width,
             layout_->GetHeight() - opening_row_y_ - opening_row_height_,
             layout_copy_, texxform,

=== modified file 'manual-tests/Preview.txt'
--- manual-tests/Preview.txt	2012-09-27 16:34:31 +0000
+++ manual-tests/Preview.txt	2012-10-03 16:39:42 +0000
@@ -187,3 +187,20 @@
 Expected Result:
   The preview window will immediately display, and if the preview takes longer 
   than 300ms to open, it will display a spinner while waiting.
+
+
+Preview Open and the Dash Navbar
+--------------------------------
+This tests that the Dash navigation bar does not show when a preview is
+open (https://bugs.launchpad.net/unity/+bug/1053313).
+
+Setup:
+#. Open dash.
+#. Open Files and Folders Lens (or any lens with 3 rows).
+
+Actions:
+#. Right-click a result on the third (bottommost) row.
+
+Expected result:
+  The Dash navigation bar should not be seen through the preview.
+