Merge lp:~gordallott/unity/fix-reflections into lp:unity

[Gord Allott]

fixes the dash reflections, they were based on the basewindow size but at some point the basewindow size got increased to the size of the maximised dash at all times, which threw the reflections off.

this is a crappy way to fix this, we'll need something better in P

[Andrea Cimitan (cimi)]

Coding wise, I can't see anything wrong. If the math and the threshold you're using to calculate the offset are right, that's a +1 from me.

review: Approve

[Jason Smith (jassmith)]

Works fine but the effect is VERY subtle. I wonder if it shouldn't be exagerated a bit more.

review: Approve

=== modified file 'plugins/unityshell/src/DashView.cpp'
--- plugins/unityshell/src/DashView.cpp	2011-09-21 20:22:09 +0000
+++ plugins/unityshell/src/DashView.cpp	2011-09-22 10:00:29 +0000
@@ -174,6 +174,8 @@
   // Minus the padding that gets added to the left
   style->SetDefaultNColumns(floorf((content_geo_.width - 32)/ (float)style->GetTileWidth()));
 
+  ubus_manager_.SendMessage(UBUS_DASH_SIZE_CHANGED, g_variant_new("(ii)", content_geo_.width, content_geo_.height));
+
   QueueDraw();
 }
 
@@ -388,8 +390,8 @@
       gfx_context.PushClippingRectangle(bg_clip);
 
       gfx_context.GetRenderStates().SetBlend(false);
-      gfx_context.QRP_1Tex (content_geo_.x, content_geo_.y, 
-                            content_geo_.width, content_geo_.height, 
+      gfx_context.QRP_1Tex (content_geo_.x, content_geo_.y,
+                            content_geo_.width, content_geo_.height,
                             bg_blur_texture_, texxform_absolute_bg, color::White);
       gPainter.PopBackground();
 
@@ -411,10 +413,10 @@
   gfx_context.GetRenderStates().SetColorMask(true, true, true, false);
   gfx_context.GetRenderStates().SetBlend(true, GL_DST_COLOR, GL_ONE);
 
-  gfx_context.QRP_1Tex (content_geo_.x, content_geo_.y, 
-                        content_geo_.width, content_geo_.height, 
+  gfx_context.QRP_1Tex (content_geo_.x, content_geo_.y,
+                        content_geo_.width, content_geo_.height,
                         bg_shine_texture_, texxform_absolute_bg, color::White);
-                                        
+
 
   // Make round corners
   nux::ROPConfig rop;
 
=== modified file 'plugins/unityshell/src/ResultViewGrid.cpp'
--- plugins/unityshell/src/ResultViewGrid.cpp	2011-09-21 11:25:04 +0000
+++ plugins/unityshell/src/ResultViewGrid.cpp	2011-09-22 10:00:29 +0000
@@ -57,6 +57,8 @@
   , lazy_load_handle_(0)
   , last_mouse_down_x_(-1)
   , last_mouse_down_y_(-1)
+  , recorded_dash_width_(-1)
+  , recorded_dash_height_(-1)
 {
   auto needredraw_lambda = [&](int value)
   {
@@ -84,6 +86,12 @@
     NeedRedraw();
   });
 
+  ubus_.RegisterInterest(UBUS_DASH_SIZE_CHANGED, [this] (GVariant* data) {
+    // on dash size changed, we update our stored values, this sucks
+    //FIXME in P - make dash size the size of our dash not the entire screen
+    g_variant_get (data, "(ii)", &recorded_dash_width_, &recorded_dash_height_);
+  });
+
   SetDndEnabled(true, false);
   NeedRedraw();
 }
@@ -559,7 +567,6 @@
   uint row_size = renderer_->height + vertical_spacing;
 
   int y_position = padding + GetGeometry().y;
-  nux::Area* top_level_parent = GetToplevel();
 
   ResultListBounds visible_bounds = GetVisableResults();
 
@@ -590,12 +597,17 @@
           state = ResultRenderer::RESULT_RENDERER_ACTIVE;
         }
 
-        int half_width = top_level_parent->GetGeometry().width / 2;
-        // FIXME - we assume the height of the viewport is 600
-        int half_height = top_level_parent->GetGeometry().height;
-
-        int offset_x = (x_position - half_width) / (half_width / 10);
-        int offset_y = ((y_position + absolute_y) - half_height) / (half_height / 10);
+        int half_width = recorded_dash_width_ / 2;
+        int half_height = recorded_dash_height_;
+
+        int offset_x = MAX(MIN((x_position - half_width) / (half_width / 10), 5), -5);
+        int offset_y = MAX(MIN(((y_position + absolute_y) - half_height) / (half_height / 10), 5), -5);
+
+        if (recorded_dash_width_ < 1 || recorded_dash_height_ < 1)
+        {
+          offset_x = 0;
+          offset_y = 0;
+        }
         nux::Geometry render_geo(x_position, y_position, renderer_->width, renderer_->height);
         renderer_->Render(GfxContext, results_[index], state, render_geo, offset_x, offset_y);
 
 
=== modified file 'plugins/unityshell/src/ResultViewGrid.h'
--- plugins/unityshell/src/ResultViewGrid.h	2011-09-19 15:12:23 +0000
+++ plugins/unityshell/src/ResultViewGrid.h	2011-09-22 10:00:29 +0000
@@ -27,6 +27,7 @@
 
 #include <UnityCore/Categories.h>
 #include "ResultView.h"
+#include "UBusWrapper.h"
 
 namespace unity
 {
@@ -100,6 +101,11 @@
   std::string current_drag_uri_;
   std::string current_drag_icon_name_;
 
+  int recorded_dash_width_;
+  int recorded_dash_height_;
+
+  UBusManager ubus_;
+
 };
 
 }
 
=== modified file 'plugins/unityshell/src/UBusMessages.h'
--- plugins/unityshell/src/UBusMessages.h	2011-09-05 14:00:26 +0000
+++ plugins/unityshell/src/UBusMessages.h	2011-09-22 10:00:29 +0000
@@ -67,4 +67,6 @@
 #define UBUS_BACKGROUND_COLOR_CHANGED "BACKGROUND_COLOR_CHANGED"
 #define UBUS_BACKGROUND_REQUEST_COLOUR_EMIT "REQUEST_BACKGROUND_COLOUR_EMIT"
 
+#define UBUS_DASH_SIZE_CHANGED "DASH_SIZE_CHANGED"
+
 #endif // UBUS_MESSAGES_H
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2011-09-19 06:05:54 +0000
+++ tests/CMakeLists.txt	2011-09-22 10:00:29 +0000
@@ -449,6 +449,9 @@
                 ${UNITY_SRC}/Timer.cpp
                 ${UNITY_SRC}/DashStyle.cpp
                 ${UNITY_SRC}/JSONParser.cpp
+                ${UNITY_SRC}/UBusMessages.h
+                ${UNITY_SRC}/UBusWrapper.cpp
+                ${UNITY_SRC}/UBusWrapper.h
                 ${UNITY_SRC}/ubus-server.cpp
                 ${UNITY_SRC}/ubus-server.h
                 )